Fix display of option disable form checkbox.

This wasn't being output when creating a new category. It needs to always be present, and shown/hidden depending on the type picked.
mysociety · Oct 2, 2024 · f14db13 · f14db13
1 parent 913d4d3
commit f14db13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/templates/web/base/admin/extra-metadata-item.html b/templates/web/base/admin/extra-metadata-item.html
@@ -68,8 +68,8 @@
                 <select class="form-control" name="metadata[[% i %]].datatype" id="metadata-[% i %]-datatype">
                     <option value="string" data-hide="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'string' %]>[% loc('Text field') %]</option>
                     <option value="text" data-hide="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'text' %]>[% loc('Textarea') %]</option>
-                    <option value="singlevaluelist" data-show="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'singlevaluelist' %]>[% loc('Drop-down list') %]</option>
-                    <option value="multivaluelist" data-show="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'multivaluelist' %]>[% loc('Checkboxes') %]</option>
+                    <option value="singlevaluelist" data-show="#metadata-[% i %]-options-group,.js-metadata-option-disable-toggle" [% 'selected' IF meta.datatype == 'singlevaluelist' %]>[% loc('Drop-down list') %]</option>
+                    <option value="multivaluelist" data-show="#metadata-[% i %]-options-group" data-hide=".js-metadata-option-disable-toggle" [% 'selected' IF meta.datatype == 'multivaluelist' %]>[% loc('Checkboxes') %]</option>
                     <option value="datetime" data-hide="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'datetime' %]>[% loc('Datetime picker') %]</option>
                 </select>
             </div>
@@ -79,7 +79,7 @@
                 <div class="js-metadata-options">
                   [% SET options = meta.item('values') ? meta.values : [] %]
                   [% FOR option IN options %]
-                    [% INCLUDE 'admin/extra-metadata-option.html' type=meta.datatype option=option i=i j=loop.index %]
+                    [% INCLUDE 'admin/extra-metadata-option.html' option=option i=i j=loop.index %]
                   [% END %]
                 </div>
 

diff --git a/templates/web/base/admin/extra-metadata-option.html b/templates/web/base/admin/extra-metadata-option.html
@@ -12,13 +12,11 @@
         </div>
     </div>
     <div class="row">
-        <div class="col">
-            [% IF type == 'singlevaluelist' %]
+        <div class="col js-metadata-option-disable-toggle">
             <p class="form-check">
                 <input type="checkbox" name="metadata[[% i %]].values[[% j %]].disable" value="1" id="metadata-[% i %]-values-[% j %]-disable" data-toggle-visibility="#js-disable-form-message-box-[% i %]-[% j %]" [% ' checked' IF option.disable %]>
                 <label for="metadata-[% i %]-values-[% j %]-disable">[% loc('Disable form when this option is selected') %]</label>
             </p>
-            [% END %]
             <p class="form-group [% 'hidden-js' IF NOT option.disable %]" id="js-disable-form-message-box-[% i %]-[% j %]">
                 <label for="disabled-message-[% i %]-[% j %]">[% loc('Message to show when form is disabled (HTML permitted)') %]</label>
                 <textarea id="disabled-message-[% i %]-[% j %]" name="metadata[[% i %]].values[[% j %]].disable_message" class="form-control">[% option.disable_message OR meta.datatype_description | html %]</textarea>