summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-10-07 12:30:02 -0400
committerTim Graham <timograham@gmail.com>2013-10-07 12:30:02 -0400
commit617aceb1b4ec97b4d70f9b3071cb46a645f69f87 (patch)
tree93536e3daa0e23a5c6c47d445e472d7d86f5cebb /django
parent4dbd95ad65fa3fc86af7391b28a759b401f530d1 (diff)
Fixed #18263 -- Corrrected handling of hidden fields in tabular admin inlines.
Thanks hvdklauw for the report and patch.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/templates/admin/edit_inline/tabular.html4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html
index e6097f0dce..0bfa405272 100644
--- a/django/contrib/admin/templates/admin/edit_inline/tabular.html
+++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html
@@ -35,7 +35,7 @@
{% for fieldset in inline_admin_form %}
{% for line in fieldset %}
{% for field in line %}
- {% if field.is_hidden %} {{ field.field }} {% endif %}
+ {% if field.field.is_hidden %} {{ field.field }} {% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
@@ -44,6 +44,7 @@
{% for fieldset in inline_admin_form %}
{% for line in fieldset %}
{% for field in line %}
+ {% if not field.field.is_hidden %}
<td{% if field.field.name %} class="field-{{ field.field.name }}"{% endif %}>
{% if field.is_readonly %}
<p>{{ field.contents|linebreaksbr }}</p>
@@ -52,6 +53,7 @@
{{ field.field }}
{% endif %}
</td>
+ {% endif %}
{% endfor %}
{% endfor %}
{% endfor %}