瀏覽代碼

Fix rendering of form textareas

jeremystretch 2 年之前
父節點
當前提交
13d604d44e
共有 2 個文件被更改,包括 1 次插入3 次删除
  1. 0 1
      netbox/core/forms/bulk_edit.py
  2. 1 2
      netbox/utilities/templates/form_helpers/render_field.html

+ 0 - 1
netbox/core/forms/bulk_edit.py

@@ -27,7 +27,6 @@ class DataSourceBulkEditForm(NetBoxModelBulkEditForm):
         required=False
         required=False
     )
     )
     comments = CommentField(
     comments = CommentField(
-        widget=forms.Textarea,
         label=_('Comments')
         label=_('Comments')
     )
     )
     parameters = forms.JSONField(
     parameters = forms.JSONField(

+ 1 - 2
netbox/utilities/templates/form_helpers/render_field.html

@@ -6,8 +6,7 @@
   {# Render the field label, except for: #}
   {# Render the field label, except for: #}
   {#   1. Checkboxes (label appears to the right of the field #}
   {#   1. Checkboxes (label appears to the right of the field #}
   {#   2. Textareas with no label set (will expand across entire row) #}
   {#   2. Textareas with no label set (will expand across entire row) #}
-  {% if field|widget_type == 'checkboxinput' or field|widget_type == 'textarea' or field|widget_type == 'markdownwidget' and not label %}
-  {% else %}
+  {% if label and not field|widget_type == 'checkboxinput' %}
     <label for="{{ field.id_for_label }}" class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}">
     <label for="{{ field.id_for_label }}" class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}">
       {{ label }}
       {{ label }}
     </label>
     </label>