Merge branch 'hotfix-1.2.8' into stable

pixl8 · Oct 14, 2024 · b00995c · b00995c
2 parents 525447a + e4a59c1
commit b00995c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.8
+
+* PXMULTISEL-16 - Multi-select does not work with custom label renderer without label field
+
 ## v1.2.7
 
 * PXMULTISEL-15 - Ability to configure label renderer

diff --git a/handlers/formcontrols/multiSelect.cfc b/handlers/formcontrols/multiSelect.cfc
@@ -225,6 +225,10 @@ component {
 			object = formParams.object ?: "";
 		}
 
+		if( len( formParams.labelField ?: "" ) ){
+			return [ "id", formParams.labelField & " as label" ];
+		}
+
 		if ( !Len( object ) ) {
 			return [ "id", "${labelfield} as label" ];
 		}
@@ -234,6 +238,10 @@ component {
 
 		ArrayAppend( selectFields, "id" );
 
+		if( !ArrayFind( selectFields, 'label' ) ){
+			ArrayAppend( selectFields, "label" );
+		}
+
 		return selectFields;
 	}
 }