mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Fixed #13875 -- Made admin's submit_row template tag pass whole context.
This commit is contained in:
parent
dcee1dfc79
commit
e972a7d03d
@ -1,6 +1,7 @@
|
||||
import json
|
||||
|
||||
from django import template
|
||||
from django.template.context import Context
|
||||
|
||||
register = template.Library()
|
||||
|
||||
@ -43,14 +44,13 @@ def submit_row(context):
|
||||
"""
|
||||
Displays the row of buttons for delete and save.
|
||||
"""
|
||||
opts = context['opts']
|
||||
change = context['change']
|
||||
is_popup = context['is_popup']
|
||||
save_as = context['save_as']
|
||||
show_save = context.get('show_save', True)
|
||||
show_save_and_continue = context.get('show_save_and_continue', True)
|
||||
ctx = {
|
||||
'opts': opts,
|
||||
ctx = Context(context)
|
||||
ctx.update({
|
||||
'show_delete_link': (
|
||||
not is_popup and context['has_delete_permission'] and
|
||||
change and context.get('show_delete', True)
|
||||
@ -61,12 +61,8 @@ def submit_row(context):
|
||||
(not save_as or context['add'])
|
||||
),
|
||||
'show_save_and_continue': not is_popup and context['has_change_permission'] and show_save_and_continue,
|
||||
'is_popup': is_popup,
|
||||
'show_save': show_save,
|
||||
'preserved_filters': context.get('preserved_filters'),
|
||||
}
|
||||
if context.get('original') is not None:
|
||||
ctx['original'] = context['original']
|
||||
})
|
||||
return ctx
|
||||
|
||||
|
||||
|
26
tests/admin_views/test_templatetags.py
Normal file
26
tests/admin_views/test_templatetags.py
Normal file
@ -0,0 +1,26 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.contrib.admin.templatetags.admin_modify import submit_row
|
||||
from django.contrib.auth.admin import UserAdmin
|
||||
from django.contrib.auth.models import User
|
||||
from django.test import RequestFactory
|
||||
from django.urls import reverse
|
||||
|
||||
from .admin import site
|
||||
from .tests import AdminViewBasicTestCase
|
||||
|
||||
|
||||
class AdminTemplateTagsTest(AdminViewBasicTestCase):
|
||||
def test_submit_row(self):
|
||||
"""
|
||||
submit_row template tag should pass whole context.
|
||||
"""
|
||||
factory = RequestFactory()
|
||||
request = factory.get(reverse('admin:auth_user_change', args=[self.superuser.pk]))
|
||||
request.user = self.superuser
|
||||
admin = UserAdmin(User, site)
|
||||
extra_context = {'extra': True}
|
||||
response = admin.change_view(request, str(self.superuser.pk), extra_context=extra_context)
|
||||
template_context = submit_row(response.context_data)
|
||||
self.assertEqual(template_context['extra'], True)
|
||||
self.assertEqual(template_context['show_save'], True)
|
Loading…
Reference in New Issue
Block a user