diff options
| author | Ryan Kaskel <dev@ryankaskel.com> | 2014-02-09 12:32:35 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-02-09 12:20:09 -0500 |
| commit | d25622000ac8a591101ade28708d3b4b8ae4b24f (patch) | |
| tree | 5eab833d9caebb9926a5f6eaf3433a0820bb8e91 | |
| parent | 1b29d3289473a6c3ce565c0ddc1bed4d5b5ac9a3 (diff) | |
Fixed #21382 - Added "has_original" to stacked inlines.
Report and original patch from jrief.
| -rw-r--r-- | django/contrib/admin/templates/admin/edit_inline/stacked.html | 2 | ||||
| -rw-r--r-- | tests/admin_inlines/tests.py | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 0fa81ef597..79c052c6c5 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -4,7 +4,7 @@ {{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.non_form_errors }} -{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}"> +{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}"> <h3><b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b> <span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %}</span> {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% trans "View on site" %}</a>{% endif %} {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %} diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index e840e21b81..4ef584f3de 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -239,6 +239,21 @@ class TestInline(TestCase): '<input class="vIntegerField" id="id_editablepkbook_set-2-0-manual_pk" name="editablepkbook_set-2-0-manual_pk" type="text" />', html=True, count=1) + def test_stacked_inline_edit_form_contains_has_original_class(self): + holder = Holder.objects.create(dummy=1) + holder.inner_set.create(dummy=1) + response = self.client.get('/admin/admin_inlines/holder/%s/' % holder.pk) + self.assertContains( + response, + '<div class="inline-related has_original" id="inner_set-0">', + count=1 + ) + self.assertContains( + response, + '<div class="inline-related" id="inner_set-1">', + count=1 + ) + @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) class TestInlineMedia(TestCase): |