small fix for field builder options shown depending on type

elabftw · Jul 26, 2023 · 3bd8211 · 3bd8211
1 parent 21cd556
commit 3bd8211
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/src/classes/App.php b/src/classes/App.php
@@ -44,7 +44,7 @@ class App
     use UploadTrait;
     use TwigTrait;
 
-    public const INSTALLED_VERSION = '4.8.0-beta';
+    public const INSTALLED_VERSION = '4.8.0';
 
     public const WHATSNEWLINK = 'https://www.deltablot.com/posts/release-480/';
 

diff --git a/src/templates/field-builder-modal.html b/src/templates/field-builder-modal.html
@@ -59,27 +59,6 @@ <h5 class='modal-title' id='fieldBuilderLabel'><i class='fas fa-fw fa-trowel'></
             <div id='newFieldContentDiv_classic'>
               <label for='newFieldValueInput'>{{ 'Default value'|trans }}</label>
               <input type='text' autocomplete='off' placeholder='{{ 'Enter a default value'|trans }}' id='newFieldValueInput' class='form-control'>
-              <div class='separator'></div>
-              <!-- Blank value on duplicate switch -->
-              <div>
-                <div class='d-inline-flex flex-row'>
-                  <div class='d-inline mr-1' for='blankValueOnDuplicateSwitch'><p>{{ 'Blank value on duplicate'|trans }}</p></div>
-                  <label class='switch'>
-                    <input type='checkbox' autocomplete='off' id='blankValueOnDuplicateSwitch'>
-                    <span class='slider'></span>
-                  </label>
-                </div>
-                </div>
-              <div>
-                {# required switch #}
-                <div class='d-inline-flex flex-row'>
-                  <div class='d-inline mr-1' for='requiredSwitch'><p>{{ 'Required'|trans }}</p></div>
-                  <label class='switch'>
-                    <input type='checkbox' autocomplete='off' id='requiredSwitch'>
-                    <span class='slider'></span>
-                  </label>
-                </div>
-              </div>
             </div>
 
             <!-- SELECT, RADIO -->
@@ -119,6 +98,28 @@ <h5 class='modal-title' id='fieldBuilderLabel'><i class='fas fa-fw fa-trowel'></
               </select>
             </div>
 
+            <div class='separator'></div>
+            {# Blank value on duplicate switch #}
+            <div>
+              <div class='d-inline-flex flex-row'>
+                <div class='d-inline mr-1' for='blankValueOnDuplicateSwitch'><p>{{ 'Blank value on duplicate'|trans }}</p></div>
+                <label class='switch'>
+                  <input type='checkbox' autocomplete='off' id='blankValueOnDuplicateSwitch'>
+                  <span class='slider'></span>
+                </label>
+              </div>
+            </div>
+            {# required switch #}
+            <div>
+              <div class='d-inline-flex flex-row'>
+                <div class='d-inline mr-1' for='requiredSwitch'><p>{{ 'Required'|trans }}</p></div>
+                <label class='switch'>
+                  <input type='checkbox' autocomplete='off' id='requiredSwitch'>
+                  <span class='slider'></span>
+                </label>
+              </div>
+            </div>
+
         </div>
         <div class='modal-footer'>
           <button type='button' class='btn btn-secondary' data-dismiss='modal'>{{ 'Close'|trans }}</button>

diff --git a/src/ts/metadata.ts b/src/ts/metadata.ts
@@ -50,7 +50,7 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   function toggleContentDiv(key: string) {
-    const keys = ['classic', 'selectradio', 'checkbox', 'number'];
+    const keys = ['classic', 'select', 'selectradio', 'checkbox', 'number'];
     document.getElementById('newFieldContentDiv_' + key).toggleAttribute('hidden', false);
     // remove the shown one from the list and hide all others
     keys.filter(k => k !== key).forEach(k => {
@@ -76,6 +76,8 @@ document.addEventListener('DOMContentLoaded', () => {
     case ExtraFieldInputType.Select:
       document.getElementById('newFieldContentDiv_select').removeAttribute('hidden');
       toggleContentDiv('selectradio');
+      // special case for the select block to allow multiple values
+      document.getElementById('newFieldContentDiv_select').toggleAttribute('hidden', false);
       break;
     case ExtraFieldInputType.Radio:
       toggleContentDiv('selectradio');