From 10e0cfc0e4e77b85e8261c908baf1c4814ded3f8 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sat, 18 Jan 2014 19:34:54 +0100 Subject: Fixed #21712 -- Moved autodiscover() to AdminConfig.ready(). Thanks Marc Tamlyn for the initial version of the patch. --- django/conf/project_template/project_name/settings.py | 2 +- django/conf/project_template/project_name/urls.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'django/conf/project_template') 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: -- cgit v1.3