diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-01-18 19:34:54 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-01-18 23:06:00 +0100 |
| commit | 10e0cfc0e4e77b85e8261c908baf1c4814ded3f8 (patch) | |
| tree | 26c894168f5875b9f7a2ace228a1b937698cc36d /django | |
| parent | 74d8fdcfa6a49cb30210c690dff08fc62b642e2a (diff) | |
Fixed #21712 -- Moved autodiscover() to AdminConfig.ready().
Thanks Marc Tamlyn for the initial version of the patch.
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/project_template/project_name/settings.py | 2 | ||||
| -rw-r--r-- | django/conf/project_template/project_name/urls.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/apps.py | 3 | ||||
| -rw-r--r-- | django/contrib/admin/sites.py | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/django/conf/project_template/project_name/settings.py b/django/conf/project_template/project_name/settings.py index efe8091e81..198a3e0d92 100644 --- a/django/conf/project_template/project_name/settings.py +++ b/django/conf/project_template/project_name/settings.py @@ -30,7 +30,7 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = ( - 'django.contrib.admin', + 'django.contrib.admin.apps.AdminConfig', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', diff --git a/django/conf/project_template/project_name/urls.py b/django/conf/project_template/project_name/urls.py index f03a29478d..d85c6f8e28 100644 --- a/django/conf/project_template/project_name/urls.py +++ b/django/conf/project_template/project_name/urls.py @@ -1,7 +1,5 @@ from django.conf.urls import patterns, include, url - from django.contrib import admin -admin.autodiscover() urlpatterns = patterns('', # Examples: 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() diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 8b81f6c68e..010574f136 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -161,8 +161,8 @@ class AdminSite(object): installed, as well as the auth context processor. """ if not apps.is_installed('django.contrib.admin'): - raise ImproperlyConfigured("Put 'django.contrib.admin' in your " - "INSTALLED_APPS setting in order to use the admin application.") + raise ImproperlyConfigured("Put 'django.contrib.admin.apps.AdminConfig' in " + "your INSTALLED_APPS setting in order to use the admin application.") if not apps.is_installed('django.contrib.contenttypes'): raise ImproperlyConfigured("Put 'django.contrib.contenttypes' in " "your INSTALLED_APPS setting in order to use the admin application.") |