From 4ccfbe3b9fcf9d3d962f4a9f234e1b834741bdd8 Mon Sep 17 00:00:00 2001
From: Brayden Tan <brayden.tan@pixl8.co.uk>
Date: Tue, 7 Jul 2026 15:37:34 +0800
Subject: [PATCH 1/3] [twgit] Init feature
 'feature-PRESIDECMS-3310_select-field-prefill-the-wrong-value'.


From 34fc856d2f0dd5c77bd04a52b10105d5a37e1328 Mon Sep 17 00:00:00 2001
From: Brayden Tan <brayden.tan@pixl8.co.uk>
Date: Tue, 7 Jul 2026 15:38:02 +0800
Subject: [PATCH 2/3] PRESIDECMS-3310 fix select field incorrect selected in a
 list of options

---
 system/views/formcontrols/checkboxList/index.cfm | 2 +-
 system/views/formcontrols/select/index.cfm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/views/formcontrols/checkboxList/index.cfm b/system/views/formcontrols/checkboxList/index.cfm
index 49515339f1..ad5801444d 100644
--- a/system/views/formcontrols/checkboxList/index.cfm
+++ b/system/views/formcontrols/checkboxList/index.cfm
@@ -28,7 +28,7 @@
 
 <cfoutput>
 	<cfloop array="#values#" index="i" item="selectValue">
-		<cfset checked    = ListFindNoCase( value, selectValue ) />
+		<cfset checked    = Find( ",#selectValue#,", ",#value#," ) />
 		<cfset valueFound = valueFound || checked />
 		<cfset elementId  = inputId & "_" & i />
 
diff --git a/system/views/formcontrols/select/index.cfm b/system/views/formcontrols/select/index.cfm
index 6d933aaf17..22ade3980e 100644
--- a/system/views/formcontrols/select/index.cfm
+++ b/system/views/formcontrols/select/index.cfm
@@ -73,7 +73,7 @@
 		</cfif>
 		<cfloop array="#values#" index="i" item="selectValue">
 			<cfset selectValue=EncodeForHTML( selectValue ) />
-			<cfset selected=exactMatchOnly ? ( value == selectValue ) : FindNoCase( value, selectValue ) />
+			<cfset selected=exactMatchOnly ? ( value == selectValue ) : Find( ",#selectValue#,", ",#value#," ) />
 			<cfset valueFound=valueFound || selected />
 			<cfset label=translateResource( labels[ i ] ?: "", labels[ i ] ?: "" ) />
 			<cfset title=EncodeForHTML( translateResource( titles[ i ] ?: "", titles[ i ] ?: "" ) ) />

From 36a2c17a72e4268adf40551117eaab9899b92867 Mon Sep 17 00:00:00 2001
From: Brayden Tan <brayden.tan@pixl8.co.uk>
Date: Tue, 7 Jul 2026 15:45:28 +0800
Subject: [PATCH 3/3] PRESIDECMS-3310 ensure check value comparison is not case
 sensitive

---
 system/views/formcontrols/checkboxList/index.cfm | 2 +-
 system/views/formcontrols/select/index.cfm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/views/formcontrols/checkboxList/index.cfm b/system/views/formcontrols/checkboxList/index.cfm
index ad5801444d..c447954eb3 100644
--- a/system/views/formcontrols/checkboxList/index.cfm
+++ b/system/views/formcontrols/checkboxList/index.cfm
@@ -28,7 +28,7 @@
 
 <cfoutput>
 	<cfloop array="#values#" index="i" item="selectValue">
-		<cfset checked    = Find( ",#selectValue#,", ",#value#," ) />
+		<cfset checked    = FindNoCase( ",#selectValue#,", ",#value#," ) />
 		<cfset valueFound = valueFound || checked />
 		<cfset elementId  = inputId & "_" & i />
 
diff --git a/system/views/formcontrols/select/index.cfm b/system/views/formcontrols/select/index.cfm
index 22ade3980e..b0526fe1a9 100644
--- a/system/views/formcontrols/select/index.cfm
+++ b/system/views/formcontrols/select/index.cfm
@@ -73,7 +73,7 @@
 		</cfif>
 		<cfloop array="#values#" index="i" item="selectValue">
 			<cfset selectValue=EncodeForHTML( selectValue ) />
-			<cfset selected=exactMatchOnly ? ( value == selectValue ) : Find( ",#selectValue#,", ",#value#," ) />
+			<cfset selected=exactMatchOnly ? ( value == selectValue ) : FindNoCase( ",#selectValue#,", ",#value#," ) />
 			<cfset valueFound=valueFound || selected />
 			<cfset label=translateResource( labels[ i ] ?: "", labels[ i ] ?: "" ) />
 			<cfset title=EncodeForHTML( translateResource( titles[ i ] ?: "", titles[ i ] ?: "" ) ) />