Changeset 8265

Timestamp:

08/09/08 11:45:15 (5 months ago)

Author:

jacob

Message:

Broke the admin's use of LogEntry? and user messages out into callbacks on ModelAdmin?. Refs #6002.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (7 diffs)

django/trunk/django/contrib/admin/options.py

@@ -263 +263 @@
-
-    def __call__(self, request, url):
-        # Check that LogEntry, ContentType and the auth context processor are installed.
-        from django.conf import settings
-        if settings.DEBUG:
-
-
-
-
-
-
-
+
-
-        # Delegate to the appropriate method, based on the URL.
@@ -286 +279 @@
-            return self.change_view(request, unquote(url))
-
+    def check_dependancies(self):
+        """
+        Check that all things needed to run the admin have been correctly installed.
+        
+        The default implementation checks that LogEntry, ContentType and the
+        auth context processor are installed.
+        """
+        from django.conf import settings
+        from django.contrib.admin.models import LogEntry
+        
+        if not LogEntry._meta.installed:
+            raise ImproperlyConfigured("Put 'django.contrib.admin' in your INSTALLED_APPS setting in order to use the admin application.")
+        if not ContentType._meta.installed:
+            raise ImproperlyConfigured("Put 'django.contrib.contenttypes' in your INSTALLED_APPS setting in order to use the admin application.")
+        if 'django.core.context_processors.auth' not in settings.TEMPLATE_CONTEXT_PROCESSORS:
+            raise ImproperlyConfigured("Put 'django.core.context_processors.auth' in your TEMPLATE_CONTEXT_PROCESSORS setting in order to use the admin application.")
+
-    def _media(self):
-        from django.conf import settings
@@ -360 +370 @@
-        for inline in self.inline_instances:
-            yield inline.get_formset(request, obj)
-
-save_add(self, request, form, formsets, post_url_continue
-
-Saves the object in the "add" stage and returns an HttpResponseRedirect.
-
-`form` is a bound Form instance that's verified to be valid
+
+log_addition(self, request, object
+
+Log that an object has been successfully added. 
+
+The default implementation creates an admin LogEntry object
-        """
-        from django.contrib.admin.models import LogEntry, ADDITION
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        """
-        from django.contrib.admin.models import LogEntry, CHANGE
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        change_message = []
-        if form.changed_data:
@@ -446 +444 @@
-                                             'object': deleted_object})
-        change_message = ' '.join(change_message)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(new_object)}
-        if request.POST.has_key("_continue"):
-request.user.message_set.create(message=
+self.message_user(request, 
-            if request.REQUEST.has_key('_popup'):
-                return HttpResponseRedirect(request.path + "?_popup=1")
@@ -458 +528 @@
-                return HttpResponseRedirect(request.path)
-        elif request.POST.has_key("_saveasnew"):
-
+
+
-            return HttpResponseRedirect("../%s/" % pk_value)
-        elif request.POST.has_key("_addanother"):
-request.user.message_set.create(message=
+self.message_user(request, 
-            return HttpResponseRedirect("../add/")
-        else:
-request.user.message_set.create(message=
+self.message_user(request, 
-            return HttpResponseRedirect("../")
-    save_change = transaction.commit_on_success(save_change)
@@ -650 +721 @@
-    def delete_view(self, request, object_id, extra_context=None):
-        "The 'delete' admin view for this model."
-        from django.contrib.admin.models import LogEntry, DELETION
-        opts = self.model._meta
-        app_label = opts.app_label
@@ -679 +749 @@
-            obj_display = str(obj)
-            obj.delete()
-
-
+
+
+
+
-            if not self.has_change_permission(request, None):
-                return HttpResponseRedirect("../../../../")