(empire-db) branch master updated: EMPIREDB-447 SelectInputControl: fix for syncOptions clear list

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new ad198ded EMPIREDB-447 SelectInputControl: fix for syncOptions clear 
list
ad198ded is described below

commit ad198ded8fc0b5e917c8a5faf657830ae6f38a1c
Author: Rainer Döbele <rdoeb...@users.noreply.github.com>
AuthorDate: Mon Nov 18 17:23:07 2024 +0100

    EMPIREDB-447
    SelectInputControl: fix for syncOptions clear list
---
 .../apache/empire/jsf2/controls/SelectInputControl.java    | 14 +++++++-------
 .../main/java/org/apache/empire/commons/StringUtils.java   |  3 ---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
index ae271bd9..dd9cfd63 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
@@ -286,13 +286,13 @@ public class SelectInputControl extends InputControl
     {
         // get the options
         Options options = ii.getOptions();
-        if (options == null)
-        { // clear or not?
-            if (ii.getValue(false) != null)
-                log.warn("No options have been set for column {}", 
ii.getColumn().getName());
+        if (options==null)
+        {   // invalid options
+            if (ii.getColumn()!=null)
+                log.warn("No options given for column {}", 
ii.getColumn().getName());
             else
-                input.getChildren().clear();
-            return;
+                log.warn("No options given for select tag {}", 
input.getClientId());
+            options = new Options();
         }
         
         // check grouping
@@ -352,7 +352,7 @@ public class SelectInputControl extends InputControl
                 continue;
             }
             // Not equal - do a full reload
-            input.getChildren().clear();
+            selectItemList.clear();
             if (hasEmpty)
             {   // add empty entry
                 addSelectItem(selectItemList, textResolver, new 
OptionEntry("", getNullText(ii)), exprType);
diff --git a/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java 
b/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
index c8ec6ae7..3e00a9bb 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
@@ -75,9 +75,6 @@ public class StringUtils
      */
     public static String toString(Object value, String listTemplate, String 
defValue)
     {
-        // Special cases
-        if (value instanceof Enum<?>)
-            return ((Enum<?>)value).name();
         // Collections
         if (value instanceof Object[])
             value = arrayToString((Object[])value, listTemplate, 
(defValue!=null ? defValue : EMPTY));