Commit 10e0cfc0 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #21712 -- Moved autodiscover() to AdminConfig.ready(). 

Thanks Marc Tamlyn for the initial version of the patch.
parent 74d8fdcf

django/conf/project_template/project_name/settings.py

+1 −1
Original line number Diff line number Diff line
@@ -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',

django/conf/project_template/project_name/urls.py

+0 −2
Original line number Diff line number Diff line 
from django.conf.urls import patterns, include, url



from django.contrib import admin

admin.autodiscover()



urlpatterns = patterns('',

    # Examples:

django/contrib/admin/apps.py

+3 −0
Original line number Diff line number Diff line
@@ -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()

django/contrib/admin/sites.py

+2 −2
Original line number Diff line number Diff line
@@ -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.")

docs/intro/tutorial01.txt

+8 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ look like this: 
    :filename: mysite/settings.py



    INSTALLED_APPS = (

        'django.contrib.admin',

        'django.contrib.admin.apps.AdminConfig',

        'django.contrib.auth',

        'django.contrib.contenttypes',

        'django.contrib.sessions',
@@ -444,6 +444,13 @@ look like this: 
        'polls',

    )



.. admonition:: Doesn't match what you see?



    If you're seeing ``'django.contrib.admin'`` instead of

    ``'django.contrib.admin.apps.AdminConfig'``, you're probably using a

    version of Django that doesn't match this tutorial version.  You'll want

    to either switch to the older tutorial or the newer Django version.



Now Django knows to include the ``polls`` app. Let's run another command:



.. code-block:: bash