Django

Code

Changeset 1551

Show
Ignore:
Timestamp:
12/05/05 22:55:33 (3 years ago)
Author:
adrian
Message:

Improved django.contrib.admin.views.main to raise ImproperlyConfigured? if admin app isn't in INSTALLED_APPS. This avoids one possibility of an obscure error.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/views/main.py

    r1508 r1551  
    55from django.core.template import loader 
    66from django.core.meta.fields import BoundField, BoundFieldLine, BoundFieldSet 
    7 from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied 
     7from django.core.exceptions import Http404, ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied 
    88from django.core.extensions import DjangoContext as Context 
    99from django.core.extensions import get_object_or_404, render_to_response 
    1010from django.core.paginator import ObjectPaginator, InvalidPage 
    1111from django.conf.settings import ADMIN_MEDIA_PREFIX 
    12 from django.models.admin import log 
     12try: 
     13    from django.models.admin import log 
     14except ImportError: 
     15    raise ImproperlyConfigured, "You don't have 'django.contrib.admin' in INSTALLED_APPS." 
    1316from django.utils.html import strip_tags 
    1417from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect