Ticket #6903: return_to_old_change_list.diff

django/contrib/admin/options.py

@@ -15 +15 @@
-from django.utils.text import capfirst, get_text_list
-from django.utils.translation import ugettext as _
-from django.utils.encoding import force_unicode
+from urllib import quote
-import sets
-
-HORIZONTAL, VERTICAL = 1, 2
@@ -394 +395 @@
-            # Figure out where to redirect. If the user has change permission,
-            # redirect to the change-list page for this object. Otherwise,
-            # redirect to the admin index.
-
+
+
+
-                post_url = '../'
-            else:
-                post_url = '../../../'
@@ -459 +462 @@
-            return HttpResponseRedirect("../add/")
-        else:
-            request.user.message_set.create(message=msg)
-
+
+
+
+
+
-    save_change = transaction.commit_on_success(save_change)
-
-    def render_change_form(self, request, model, context, add=False, change=False, form_url='', obj=None):
@@ -508 +515 @@
-        inline_formsets = []
-        obj = self.model()
-        if request.method == 'POST':
+            if 'admin_change_return_to' in request.GET:
+                return_to = request.GET['admin_change_return_to']
+            else:
+                return_to = None
+            
-            form = ModelForm(request.POST, request.FILES)
-            for FormSet in self.get_formsets(request):
-                inline_formset = FormSet(data=request.POST, files=request.FILES,
@@ -520 +532 @@
-            for FormSet in self.get_formsets(request):
-                inline_formset = FormSet(instance=obj)
-                inline_formsets.append(inline_formset)
+            if 'HTTP_REFERER' in request.META:
+                return_to = request.META['HTTP_REFERER']
+            else:
+                return_to = None
-
+        if return_to:
+            form_url = form_url + '?admin_change_return_to=%s' % quote(return_to)
+
-        adminForm = AdminForm(form, list(self.get_fieldsets(request)), self.prepopulated_fields)
-        media = self.media + adminForm.media
-        for fs in inline_formsets:
@@ -543 +562 @@
-            'root_path': self.admin_site.root_path,
-        }
-        context.update(extra_context or {})
-
+form_url=form_url, 
-
-    def change_view(self, request, object_id, extra_context=None):
-        "The 'change' admin view for this model."
@@ -571 +590 @@
-        ModelForm = self.get_form(request, obj)
-        inline_formsets = []
-        if request.method == 'POST':
+            if 'admin_change_return_to' in request.GET:
+                return_to = request.GET['admin_change_return_to']
+            else:
+                return_to = None
+            
-            form = ModelForm(request.POST, request.FILES, instance=obj)
-            for FormSet in self.get_formsets(request, obj):
-                inline_formset = FormSet(request.POST, request.FILES, instance=obj)
@@ -583 +607 @@
-            for FormSet in self.get_formsets(request, obj):
-                inline_formset = FormSet(instance=obj)
-                inline_formsets.append(inline_formset)
+            if 'HTTP_REFERER' in request.META:
+                return_to = request.META['HTTP_REFERER']
+            else:
+                return_to = None
+        
+        if return_to:
+            form_url = '?admin_change_return_to=%s' % quote(return_to)
+        else:
+            form_url = ''
-
-        ## Populate the FormWrapper.
-        #oldform = oldforms.FormWrapper(manipulator, new_data, errors)
@@ -620 +653 @@
-            'errors': AdminErrorList(form, inline_formsets),
-            'root_path': self.admin_site.root_path,
-        }
-
-
+ 
+form_url=form_url, 
-
-    def changelist_view(self, request, extra_context=None):
-        "The 'change list' admin view for this model."