Merge branch 'hotfix-1.2.9' into stable

pixl8 · Oct 23, 2024 · f497f1e · f497f1e
2 parents b00995c + 16a4abf
commit f497f1e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.9
+
+* MXMULTISEL-17 - 500 error : Ambiguous `label` column error 
+
 ## v1.2.8
 
 * PXMULTISEL-16 - Multi-select does not work with custom label renderer without label field

diff --git a/handlers/formcontrols/multiSelect.cfc b/handlers/formcontrols/multiSelect.cfc
@@ -66,7 +66,6 @@ component {
 							, filter       = { id = ListToArray( args.defaultValue ) }
 						}
 					]
-					, orderby      = orderBy
 				);
 			} else {
 				args.records = presideObjectService.selectData(
@@ -236,12 +235,20 @@ component {
 		var labelRenderer = formParams.labelRenderer = formParams.labelRenderer ?: presideObjectService.getObjectAttribute( object, "labelRenderer" );
 		var selectFields  = labelRendererService.getSelectFieldsForLabel( labelRenderer );
 
-		ArrayAppend( selectFields, "id" );
+		var hasLabelOnSelectField = false;
+		for ( var field in selectFields ) {
+			if ( arrayLen( reMatchNoCase( "^(.*\s+as\s+)?label$", field ) ) ) {
+				hasLabelOnSelectField = true;
+				break;
+			}
+		}
 
-		if( !ArrayFind( selectFields, 'label' ) ){
+		if ( !hasLabelOnSelectField ) {
 			ArrayAppend( selectFields, "label" );
 		}
 
+		ArrayAppend( selectFields, "id" );
+
 		return selectFields;
 	}
 }