summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-05-28 16:18:53 +0200
committerTim Graham <timograham@gmail.com>2018-06-03 22:19:04 -0400
commitbec651a427fc032d9115d30c8c5d0e702d754f6c (patch)
tree671d4b8b765b48e172301644e28031e2e0467c70 /django
parent747ff7a30b79e12d344169200de24f88a22ddee9 (diff)
Fixed #10827 -- Ensured ContentTypes are created before permission creation.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/auth/management/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py
index cdf7203a9d..7c9618c63b 100644
--- a/django/contrib/auth/management/__init__.py
+++ b/django/contrib/auth/management/__init__.py
@@ -6,6 +6,7 @@ import unicodedata
from django.apps import apps as global_apps
from django.contrib.auth import get_permission_codename
+from django.contrib.contenttypes.management import create_contenttypes
from django.core import exceptions
from django.db import DEFAULT_DB_ALIAS, router
@@ -37,6 +38,11 @@ def create_permissions(app_config, verbosity=2, interactive=True, using=DEFAULT_
if not app_config.models_module:
return
+ # Ensure that contenttypes are created for this app. Needed if
+ # 'django.contrib.auth' is in INSTALLED_APPS before
+ # 'django.contrib.contenttypes'.
+ create_contenttypes(app_config, verbosity=verbosity, interactive=interactive, using=using, apps=apps, **kwargs)
+
app_label = app_config.label
try:
app_config = apps.get_app_config(app_label)