diff options
| author | Christopher Medrela <chris.medrela@gmail.com> | 2013-02-23 18:57:48 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-10-04 14:08:06 -0400 |
| commit | dc3d2ac98c1bcfad74d3e9523caf07e7e9fb15aa (patch) | |
| tree | 6a9ce82d156e662c1e4170e1210fc84659f33e78 /django | |
| parent | bcd4c3f27d5bcf701337ac7c74c042d90792bdc3 (diff) | |
Fixed #11277 -- Hid labels of fields with HiddenInput widget in admin forms.
Thanks bartTC for the report.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/helpers.py | 3 | ||||
| -rw-r--r-- | django/contrib/admin/static/admin/css/forms.css | 4 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/includes/fieldset.html | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index cd784f5cbd..622664fc6b 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -84,6 +84,9 @@ class Fieldline(object): self.fields = [field] else: self.fields = field + self.has_visible_field = not all(field in self.form.fields and + self.form.fields[field].widget.is_hidden + for field in self.fields) self.model_admin = model_admin if readonly_fields is None: readonly_fields = () diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 4885f62566..a187f895fd 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -18,6 +18,10 @@ form .form-row p { font-size: 11px; } +.hidden { + display: none; +} + /* FORM LABELS */ form h4 { diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html index 24b069cb2f..f38564c5af 100644 --- a/django/contrib/admin/templates/admin/includes/fieldset.html +++ b/django/contrib/admin/templates/admin/includes/fieldset.html @@ -4,10 +4,10 @@ <div class="description">{{ fieldset.description|safe }}</div> {% endif %} {% for line in fieldset %} - <div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}"> + <div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}"> {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %} {% for field in line %} - <div{% if not line.fields|length_is:'1' %} class="field-box{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}"{% elif field.is_checkbox %} class="checkbox-row"{% endif %}> + <div{% if not line.fields|length_is:'1' %} class="field-box{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}"{% elif field.is_checkbox %} class="checkbox-row"{% endif %}> {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %} {% if field.is_checkbox %} {{ field.field }}{{ field.label_tag }} |