From a9d00cd3c1e0fc80fae96da53c99533964991673 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Mon, 5 Dec 2022 11:37:17 +0100
Subject: [PATCH] select list/box: display values respecting possible values
 order

---
 .../default/LSformElement_select.tpl          | 19 ++++++++++++++++---
 .../default/LSformElement_select_box.tpl      | 19 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/templates/default/LSformElement_select.tpl b/src/templates/default/LSformElement_select.tpl
index 7782fb2e..a5683e30 100644
--- a/src/templates/default/LSformElement_select.tpl
+++ b/src/templates/default/LSformElement_select.tpl
@@ -1,10 +1,23 @@
 <ul class='LSform' id='{$attr_name|escape:"htmlall"}'>
 {if $freeze}
+  {foreach from=$possible_values item=label key=value name=LSformElement_selectbox}
+    {if is_array($label)}
+      {if count($label.possible_values)>0}
+        {foreach from=$label.possible_values item=l key=v name=LSformElement_selectbox_sub_values}
+          {if in_array($v, $values)}
+            <li>{$l|escape:"htmlall"}</li>
+          {/if}
+        {/foreach}
+      {/if}
+    {else}
+      {if in_array($value, $values)}
+        <li>{$label|escape:"htmlall"}</li>
+      {/if}
+    {/if}
+  {/foreach}
   {foreach from=$values item=value}
     {LSformElement_select_checkIsValidValue value=$value possible_values=$possible_values}
-    {if $LSformElement_select_isValidValue}
-    <li>{$LSformElement_select_isValidValue_label|escape:"htmlall"}</li>
-    {else}
+    {if !$LSformElement_select_isValidValue}
     <li class='LSform-errors'>{getFData format=$unrecognized_value_label_format data=$value}</li>
     {/if}
   {foreachelse}
diff --git a/src/templates/default/LSformElement_select_box.tpl b/src/templates/default/LSformElement_select_box.tpl
index 469165db..9ff2087e 100644
--- a/src/templates/default/LSformElement_select_box.tpl
+++ b/src/templates/default/LSformElement_select_box.tpl
@@ -1,10 +1,23 @@
 <ul class='LSform{if $inline} LSformElement_select_box_inline{/if}' id='{$attr_name|escape:"htmlall"}'>
 {if $freeze}
+  {foreach from=$possible_values item=label key=value name=LSformElement_selectbox}
+    {if is_array($label)}
+      {if count($label.possible_values)>0}
+        {foreach from=$label.possible_values item=l key=v name=LSformElement_selectbox_sub_values}
+          {if in_array($v, $values)}
+            <li>{$l|escape:"htmlall"}</li>
+          {/if}
+        {/foreach}
+      {/if}
+    {else}
+      {if in_array($value, $values)}
+        <li>{$label|escape:"htmlall"}</li>
+      {/if}
+    {/if}
+  {/foreach}
   {foreach from=$values item=value}
     {LSformElement_select_checkIsValidValue value=$value possible_values=$possible_values}
-    {if $LSformElement_select_isValidValue}
-    <li>{$LSformElement_select_isValidValue_label|escape:"htmlall"}</li>
-    {else}
+    {if !$LSformElement_select_isValidValue}
     <li class='LSform-errors'>{getFData format=$unrecognized_value_label_format data=$value}</li>
     {/if}
   {foreachelse}