Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Improved django.contrib.admin.views.main to raise ImproperlyConfigure…

…d if admin app isn't in INSTALLED_APPS. This avoids one possibility of an obscure error.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 54618dc0fe7338d7fea7a893ef1b418780b045ad 1 parent 0020326
@adrianholovaty adrianholovaty authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/contrib/admin/views/main.py
View
7 django/contrib/admin/views/main.py
@@ -4,12 +4,15 @@
from django.core import formfields, meta, template
from django.core.template import loader
from django.core.meta.fields import BoundField, BoundFieldLine, BoundFieldSet
-from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied
+from django.core.exceptions import Http404, ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
from django.core.extensions import DjangoContext as Context
from django.core.extensions import get_object_or_404, render_to_response
from django.core.paginator import ObjectPaginator, InvalidPage
from django.conf.settings import ADMIN_MEDIA_PREFIX
-from django.models.admin import log
+try:
+ from django.models.admin import log
+except ImportError:
+ raise ImproperlyConfigured, "You don't have 'django.contrib.admin' in INSTALLED_APPS."
from django.utils.html import strip_tags
from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect
from django.utils.text import capfirst, get_text_list
Please sign in to comment.
Something went wrong with that request. Please try again.