Changeset 7872

Timestamp:

07/09/08 11:01:33 (3 months ago)

Author:

brosner

Message:

newforms-admin: Added autodiscover functionality to django.contrib.admin. This makes the admin aware of per-app admin.py modules and does an import on them when explicitly called. Docs show how this is used. Fixed #6003, #6776, #6776.

Files:

• django/branches/newforms-admin/django/contrib/admin/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/docs/admin.txt (modified) (3 diffs)

django/branches/newforms-admin/django/contrib/admin/__init__.py

@@ -2 +2 @@
-from django.contrib.admin.options import StackedInline, TabularInline
-from django.contrib.admin.sites import AdminSite, site
+
+def autodiscover():
+    """
+    Auto-discover INSTALLED_APPS admin.py modules and fail silently when 
+    not present. This forces an import on them to register any admin bits they
+    may want.
+    """
+    from django.conf import settings
+    for app in settings.INSTALLED_APPS:
+        try:
+            __import__("%s.admin" % app)
+        except ImportError:
+            pass

django/branches/newforms-admin/docs/admin.txt

@@ -610 +610 @@
-    from django.conf.urls.defaults import *
-    from django.contrib import admin
+    
+    admin.autodiscover()
-
-    urlpatterns = patterns('',
@@ -615 +617 @@
-    )
-
+Above we used ``admin.autodiscover()`` to automatically load the
+``INSTALLED_APPS`` admin.py modules.
+
-In this example, we register the ``AdminSite`` instance
-``myproject.admin.admin_site`` at the URL ``/myadmin/`` ::
@@ -625 +630 @@
-        ('^myadmin/(.*)', admin_site.root),
-    )
+
+There is really no need to use autodiscover when using your own ``AdminSite``
+instance since you will likely be importing all the per-app admin.py modules
+in your ``myproject.admin`` module.
-
-Note that the regular expression in the URLpattern *must* group everything in