Changeset 8985

Timestamp:

09/08/08 00:45:17 (2 months ago)

Author:

adrian

Message:

Fixed #7929 -- Removed some snippets of admin code that weren't doing anything, and tightened up a few more lines. Plus, an indentation fix. Thanks, julien

Files:

• django/trunk/django/contrib/admin/options.py (modified) (5 diffs)
• django/trunk/django/contrib/admin/sites.py (modified) (1 diff)
• django/trunk/django/contrib/admin/widgets.py (modified) (1 diff)

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

@@ -472 +472 @@
-        model = self.model
-        opts = model._meta
-        app_label = opts.app_label
-
-        if not self.has_add_permission(request):
-            raise PermissionDenied
-
-        if self.has_change_permission(request, None):
-            # redirect to list view
-            post_url = '../'
-        else:
-            # Object list will give 'Permission Denied', so go back to admin home
-            post_url = '../../../'
-
-        ModelForm = self.get_form(request)
@@ -542 +534 @@
-            'errors': helpers.AdminErrorList(form, formsets),
-            'root_path': self.admin_site.root_path,
-
+opts.
-        }
-        context.update(extra_context or {})
@@ -552 +544 @@
-        model = self.model
-        opts = model._meta
-        app_label = opts.app_label
-
-        try:
@@ -621 +612 @@
-            'errors': helpers.AdminErrorList(form, formsets),
-            'root_path': self.admin_site.root_path,
-
+opts.
-        }
-        context.update(extra_context or {})
@@ -739 +730 @@
-        context.update(extra_context or {})
-        return render_to_response(self.object_history_template or [
-opts.
-opts.
+
+
-            "admin/object_history.html"
-        ], context, context_instance=template.RequestContext(request))

django/trunk/django/contrib/admin/sites.py

@@ -106 +106 @@
-        auth context processor are installed.
-        """
-        from django.conf import settings
-        from django.contrib.admin.models import LogEntry
-        from django.contrib.contenttypes.models import ContentType

django/trunk/django/contrib/admin/widgets.py

@@ -115 +115 @@
-            url = ''
-        if not attrs.has_key('class'):
-
+  
-        output = [super(ForeignKeyRawIdWidget, self).render(name, value, attrs)]
-        # TODO: "id_" is hard-coded here. This should instead use the correct