Ticket #9295: geoadminsite.diff

django/contrib/gis/admin/__init__.py

@@ -1 +1 @@
 # Getting the normal admin routines, classes, and `site` instance.
-from django.contrib.admin import autodiscover, site, AdminSite, ModelAdmin, StackedInline, TabularInline, HORIZONTAL, VERTICAL
+from django.contrib.admin import autodiscover as _autodiscover, site as _site, AdminSite, ModelAdmin, StackedInline, TabularInline, HORIZONTAL, VERTICAL
 
 # Geographic admin options classes and widgets.
 from django.contrib.gis.admin.options import GeoModelAdmin
 from django.contrib.gis.admin.widgets import OpenLayersWidget
+from django.contrib.gis.admin.sites import site, GeoAdminSite
 
 try:
     from django.contrib.gis.admin.options import OSMGeoAdmin
     HAS_OSM = True
 except ImportError:
     HAS_OSM = False
+
+def autodiscover():
+    """
+    Overridden from the regular admin autodiscover so that the geographic
+    `site` instance may also use apps registered with the 'normal' admin
+    `site` instance.
+    """
+    _autodiscover()
+    site._registry.update(_site._registry)

django/contrib/gis/admin/sites.py

@@ +1 @@
+from django.contrib.admin import AdminSite
+
+class GeoAdminSite(AdminSite):
+    
+    def check_dependencies(self):
+        """
+        Check if requirements are met if any OSMGeoAdmin option classes
+        were used.
+        """
+        # TODO: Check GDAL version, PROJ.4 datum shifting files.
+        super(GeoAdminSite, self).check_dependencies()
+
+# This global object represents the default geographic admin site. Users
+# may instantiate `GeoAdminSite` for their own custom sites.
+site = GeoAdminSite()