Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1bfed070c32173e69be6272b274506c1bd56d413 1 parent 6bdb7b9
Adrian Holovaty authored September 08, 2008
17  django/contrib/admin/options.py
@@ -471,18 +471,10 @@ def add_view(self, request, form_url='', extra_context=None):
471 471
         "The 'add' admin view for this model."
472 472
         model = self.model
473 473
         opts = model._meta
474  
-        app_label = opts.app_label
475 474
 
476 475
         if not self.has_add_permission(request):
477 476
             raise PermissionDenied
478 477
 
479  
-        if self.has_change_permission(request, None):
480  
-            # redirect to list view
481  
-            post_url = '../'
482  
-        else:
483  
-            # Object list will give 'Permission Denied', so go back to admin home
484  
-            post_url = '../../../'
485  
-
486 478
         ModelForm = self.get_form(request)
487 479
         formsets = []
488 480
         if request.method == 'POST':
@@ -541,7 +533,7 @@ def add_view(self, request, form_url='', extra_context=None):
541 533
             'inline_admin_formsets': inline_admin_formsets,
542 534
             'errors': helpers.AdminErrorList(form, formsets),
543 535
             'root_path': self.admin_site.root_path,
544  
-            'app_label': app_label,
  536
+            'app_label': opts.app_label,
545 537
         }
546 538
         context.update(extra_context or {})
547 539
         return self.render_change_form(request, context, add=True)
@@ -551,7 +543,6 @@ def change_view(self, request, object_id, extra_context=None):
551 543
         "The 'change' admin view for this model."
552 544
         model = self.model
553 545
         opts = model._meta
554  
-        app_label = opts.app_label
555 546
 
556 547
         try:
557 548
             obj = model._default_manager.get(pk=object_id)
@@ -620,7 +611,7 @@ def change_view(self, request, object_id, extra_context=None):
620 611
             'inline_admin_formsets': inline_admin_formsets,
621 612
             'errors': helpers.AdminErrorList(form, formsets),
622 613
             'root_path': self.admin_site.root_path,
623  
-            'app_label': app_label,
  614
+            'app_label': opts.app_label,
624 615
         }
625 616
         context.update(extra_context or {})
626 617
         return self.render_change_form(request, context, change=True, obj=obj)
@@ -738,8 +729,8 @@ def history_view(self, request, object_id, extra_context=None):
738 729
         }
739 730
         context.update(extra_context or {})
740 731
         return render_to_response(self.object_history_template or [
741  
-            "admin/%s/%s/object_history.html" % (opts.app_label, opts.object_name.lower()),
742  
-            "admin/%s/object_history.html" % opts.app_label,
  732
+            "admin/%s/%s/object_history.html" % (app_label, opts.object_name.lower()),
  733
+            "admin/%s/object_history.html" % app_label,
743 734
             "admin/object_history.html"
744 735
         ], context, context_instance=template.RequestContext(request))
745 736
 
1  django/contrib/admin/sites.py
@@ -105,7 +105,6 @@ def check_dependencies(self):
105 105
         The default implementation checks that LogEntry, ContentType and the
106 106
         auth context processor are installed.
107 107
         """
108  
-        from django.conf import settings
109 108
         from django.contrib.admin.models import LogEntry
110 109
         from django.contrib.contenttypes.models import ContentType
111 110
 
2  django/contrib/admin/widgets.py
@@ -114,7 +114,7 @@ def render(self, name, value, attrs=None):
114 114
         else:
115 115
             url = ''
116 116
         if not attrs.has_key('class'):
117  
-          attrs['class'] = 'vForeignKeyRawIdAdminField' # The JavaScript looks for this hook.
  117
+            attrs['class'] = 'vForeignKeyRawIdAdminField' # The JavaScript looks for this hook.
118 118
         output = [super(ForeignKeyRawIdWidget, self).render(name, value, attrs)]
119 119
         # TODO: "id_" is hard-coded here. This should instead use the correct
120 120
         # API to determine the ID dynamically.

0 notes on commit 1bfed07

Please sign in to comment.
Something went wrong with that request. Please try again.