Ticket #11974: admin_modify.diff

contrib/admin/templatetags/admin_modify.py

@@ -1 +1 @@
 from django import template
+from django.template.loader import render_to_string
 
 register = template.Library()
 
@@ -19 +20 @@
     return context
 prepopulated_fields_js = register.inclusion_tag('admin/prepopulated_fields_js.html', takes_context=True)(prepopulated_fields_js)
 
-def submit_row(context):
-    opts = context['opts']
-    change = context['change']
-    is_popup = context['is_popup']
-    save_as = context['save_as']
-    return {
-        'onclick_attrib': (opts.get_ordered_objects() and change
-                            and 'onclick="submitOrderForm();"' or ''),
-        'show_delete_link': (not is_popup and context['has_delete_permission']
-                              and (change or context['show_delete'])),
-        'show_save_as_new': not is_popup and change and save_as,
-        'show_save_and_add_another': context['has_add_permission'] and 
-                            not is_popup and (not save_as or context['add']),
-        'show_save_and_continue': not is_popup and context['has_change_permission'],
-        'is_popup': is_popup,
-        'show_save': True
-    }
-submit_row = register.inclusion_tag('admin/submit_line.html', takes_context=True)(submit_row)
+class SubmitRowNode(template.Node):
+    def render(self, context):
+        app_label = context['app_label']
+        opts = context['opts']
+        change = context['change']
+        is_popup = context['is_popup']
+        save_as = context['save_as']
+        context = {
+            'onclick_attrib': (opts.get_ordered_objects() and change
+                                and 'onclick="submitOrderForm();"' or ''),
+            'show_delete_link': (not is_popup and context['has_delete_permission']
+                                  and (change or context['show_delete'])),
+            'show_save_as_new': not is_popup and change and save_as,
+            'show_save_and_add_another': context['has_add_permission'] and 
+                                not is_popup and (not save_as or context['add']),
+            'show_save_and_continue': not is_popup and context['has_change_permission'],
+            'is_popup': is_popup,
+            'show_save': True
+        }
+        return render_to_string([
+            "admin/%s/%s/submit_line.html" % (app_label, opts.object_name.lower()),
+            "admin/%s/submit_line.html" % app_label,
+            "admin/submit_line.html"
+        ], context)
+
+def submit_row(parser, token):
+    return SubmitRowNode()
+submit_row = register.tag(name="submit_row")(submit_row)