Merge branch 'hotfix-3.1.3' into stable

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.1.3
+
+* Add property’s name to data returned by field settings
+
 ## v3.1.2
 
 * Pass through all args when using recordCountOnly=true to ensure saved/extra filters are included

services/DataApiConfigurationService.cfc

@@ -140,15 +140,15 @@ component {
 			return entities[ args.entity ].upsertFields ?: [];
 		} );
 	}
-	
+
 	public array function getRelevantQueueFields( required string entity, string namespace=_getDataApiNamespace() ) {
 		var args     = arguments;
 		var cacheKey = "getRelevantQueueFields" & args.namespace & args.entity;
-		
+
 		return _simpleLocalCache( cacheKey, function(){
 			var objectName = getEntityObject( args.entity, args.namespace );
 			var fields     = $getPresideObjectService().getObjectAttribute( objectName, "dataApiQueueRelevantFields#_getNamespaceWithSeparator( args.namespace )#" );
-			
+
 			return listToArray( fields );
 		} );
 	}
@@ -170,6 +170,7 @@ component {
 					, type       = props[ field ][ "dataApiType#namespace#"       ] ?: ""
 					, format     = props[ field ][ "dataApiFormat#namespace#"     ] ?: ""
 					, derivative = props[ field ][ "dataApiDerivative#namespace#" ] ?: ""
+					, name       = field
 				};
 			}