summaryrefslogtreecommitdiff
path: root/django/contrib/admin/apps.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-01-18 19:34:54 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-01-18 23:06:00 +0100
commit10e0cfc0e4e77b85e8261c908baf1c4814ded3f8 (patch)
tree26c894168f5875b9f7a2ace228a1b937698cc36d /django/contrib/admin/apps.py
parent74d8fdcfa6a49cb30210c690dff08fc62b642e2a (diff)
Fixed #21712 -- Moved autodiscover() to AdminConfig.ready().
Thanks Marc Tamlyn for the initial version of the patch.
Diffstat (limited to 'django/contrib/admin/apps.py')
-rw-r--r--django/contrib/admin/apps.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/admin/apps.py b/django/contrib/admin/apps.py
index 980ff0c369..a8f0e91ea6 100644
--- a/django/contrib/admin/apps.py
+++ b/django/contrib/admin/apps.py
@@ -6,3 +6,6 @@ from django.utils.translation import ugettext_lazy as _
class AdminConfig(AppConfig):
name = 'django.contrib.admin'
verbose_name = _("administration")
+
+ def ready(self):
+ self.module.autodiscover()