summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2021-02-22 09:12:33 +0000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-02-22 10:13:14 +0100
commiteccf40a3038bb38c4fd0e7c3ada03e7a9a02c091 (patch)
tree76d5d941aa442f9b1881f336b898ae8ce582a6b9
parent06905243a31c11bd849b4fead910cf0a9a2673d7 (diff)
[3.2.x] Refs #16117 -- Made @action and @display decorators importable from django.contrib.gis.admin.
Backport of 8f02a78695a6c07bc5b05499e6e6cf96bc25320f from master
-rw-r--r--django/contrib/gis/admin/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/admin/__init__.py b/django/contrib/gis/admin/__init__.py
index e014f12ceb..b0edaf0193 100644
--- a/django/contrib/gis/admin/__init__.py
+++ b/django/contrib/gis/admin/__init__.py
@@ -1,12 +1,12 @@
from django.contrib.admin import (
HORIZONTAL, VERTICAL, AdminSite, ModelAdmin, StackedInline, TabularInline,
- autodiscover, register, site,
+ action, autodiscover, display, register, site,
)
from django.contrib.gis.admin.options import GeoModelAdmin, OSMGeoAdmin
from django.contrib.gis.admin.widgets import OpenLayersWidget
__all__ = [
'HORIZONTAL', 'VERTICAL', 'AdminSite', 'ModelAdmin', 'StackedInline',
- 'TabularInline', 'autodiscover', 'register', 'site',
+ 'TabularInline', 'action', 'autodiscover', 'display', 'register', 'site',
'GeoModelAdmin', 'OSMGeoAdmin', 'OpenLayersWidget',
]