Merge pull request #2006 from scireum/feature/jvo/readonly-lookup-val…

…ue-elements
scireum · Jun 14, 2024 · 979647c · 979647c
2 parents 64fb784 + 64fcb72
commit 979647c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/src/main/resources/default/taglib/t/lookupValue.html.pasta b/src/main/resources/default/taglib/t/lookupValue.html.pasta
@@ -12,12 +12,19 @@
 <i:arg name="allowCustomEntries" type="boolean" default="@value.acceptsCustomValues()"/>
 <i:arg name="class" type="String" default="" description="Lists additional CSS classes to apply to the field."/>
 
+
 <i:pragma name="inline" value="true"/>
 <i:pragma name="description" value="Renders a dropdown field for a LookupValue field"/>
 
 
-<t:singleSelect name="@name" label="@label" help="@help" optional="@optional" readonly="@readonly" id="@id"
-                allowCustomEntries="@allowCustomEntries" class="@class"
+<t:singleSelect name="@name"
+                label="@label"
+                help="@help"
+                optional="@optional"
+                readonly="@readonly"
+                id="@id"
+                allowCustomEntries="@allowCustomEntries"
+                class="@class"
                 suggestionUri="@apply('/system/lookuptable/autocomplete/%s/%s/%s', table, value.getDisplay(), value.getExtendedDisplay())">
     <i:block name="addon">
         <i:if test="showSelectionButton">
@@ -38,7 +45,9 @@
                            tableName: '___table',
                            labelFormat: '___value.getDisplay()',
                            codeCallback: function (code, name) {
-                                autocomplete.val({value: code, text: name});
+                               @if (!readonly) {
+                                   autocomplete.val({value: code, text: name});
+                               }
                            }
                        });
             }

diff --git a/src/main/resources/default/taglib/t/lookupValues.html.pasta b/src/main/resources/default/taglib/t/lookupValues.html.pasta
@@ -5,6 +5,7 @@
 <i:arg name="helpKey" type="String" default=""/>
 <i:arg name="help" type="String" default="@i18n(helpKey)"/>
 <i:arg name="readonly" type="boolean" default="false"/>
+<i:arg name="showSelectionButton" type="boolean" default="true"/>
 <i:arg name="table" type="String" default="@values.getTableName()"/>
 <i:arg name="id" type="String" default="@generateId('singleselect-%s')"/>
 <i:arg name="class" type="String" default="" description="Lists additional CSS classes to apply to the field."/>
@@ -14,27 +15,38 @@
 <i:pragma name="description" value="Renders a multiselect dropdown field for LookupValues field"/>
 
 
-<t:multiSelect name="@name" label="@label" help="@help" readonly="@readonly" id="@id"
-               allowCustomEntries="@values.acceptsCustomValues()" class="@class"
+<t:multiSelect name="@name"
+               label="@label"
+               help="@help"
+               readonly="@readonly"
+               id="@id"
+               allowCustomEntries="@values.acceptsCustomValues()"
+               class="@class"
                suggestionUri="@apply('/system/lookuptable/autocomplete/%s/%s/%s', table, values.getDisplay(), values.getExtendedDisplay())">
     <i:block name="addon">
-        <a class="btn btn-outline-secondary" id="@id-addon"><i class="fa-solid fa-bolt"></i></a>
+        <i:if test="showSelectionButton">
+            <a class="btn btn-outline-secondary" id="@id-addon"><i class="fa-solid fa-bolt"></i></a>
+        </i:if>
     </i:block>
     <i:block name="script">
+        <i:if test="showSelectionButton">
             const helper = document.getElementById('___id-addon');
             helper.addEventListener('click', function () {
                 new LookupTableInfo({
                     tableName: '___table',
                     labelFormat: '___values.getDisplay()',
                     codeCallback: function (code, name) {
-                        if (!autocomplete.val().includes(code)) {
-                            autocomplete.addToken({value: code, text: name});
-                        } else {
-                            autocomplete.select.removeTokenWithText(name);
+                        @if (!readonly) {
+                            if (!autocomplete.val().includes(code)) {
+                                autocomplete.addToken({value: code, text: name});
+                            } else {
+                                autocomplete.select.removeTokenWithText(name);
+                            }
                         }
                     }
                 });
             });
+        </i:if>
     </i:block>
     <i:for var="tuple"
            type="Tuple"