#310 changed 'optional' suffix rendering condition for disabled=False

dpgmediamagazines · Sep 10, 2018 · abc5ba0 · abc5ba0
1 parent 16fcd1b
commit abc5ba0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Always reference the ticket number at the end of the issue description.
 
 
+## Pending
+
+### Fixed
+
+- field_label: changed 'optional' suffix rendering condition for disabled=False [#310][310]
+
+[310]: //github.com/sanoma/django-arctic/issues/310
+
+
 ## 1.3.2 (2018-07-24)
 
 ### Fixed

diff --git a/arctic/templates/arctic/partials/form_field_parts/field_label.html b/arctic/templates/arctic/partials/form_field_parts/field_label.html
@@ -2,7 +2,7 @@
 {# This template makes it easier to overwrite all the labels for the different form types #}
 {{ field.label|safe }}
 {% if field.field.widget|typename != 'CheckboxInput' and field.field.widget|typename != 'RadioSelect' %}
-    {% if not field.field.required %}
+    {% if not field.field.required and not field.field.disabled %}
         <i class="optional-field-text">({% trans 'optional' %})</i>
     {% endif %}
 {% endif %}