214 empty lists fixes
This commit is contained in:
@@ -467,15 +467,19 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In
|
||||
<m:field>sop.svc_operation_cfs_param</m:field>
|
||||
<m:field>sop.data_type</m:field>
|
||||
<m:field>null as data_descriptor</m:field>
|
||||
<m:field formatter=#function(x){return listToArray(x);}# type="list">sop.value_list</m:field>
|
||||
<m:field formatter=#(x)=>((isArray(x) OR isEmpty(x))? x : listToArray(x))#>sop.value_list</m:field>
|
||||
<m:field>u.login as creator_login</m:field>
|
||||
<m:field>u.shortname as creator_shortname</m:field>
|
||||
<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
|
||||
<m:field>sop.man</m:field>
|
||||
|
||||
<m:field>sop.func</m:field>
|
||||
<m:field>sop.nested_ref</m:field>
|
||||
<m:field>sop.config::text as config</m:field>
|
||||
<m:field>sop.expression</m:field>
|
||||
<m:field>sop.nested_ref</m:field>
|
||||
<m:field>sop.state_path</m:field>
|
||||
<m:field>sop.depends_on_cfs_params</m:field>
|
||||
|
||||
<m:field>sop.config::text as config</m:field>
|
||||
<m:field>e.service_id</m:field>
|
||||
<m:field>e.instance_uid::text as instance_uid</m:field>
|
||||
</m:field_set>
|
||||
@@ -522,7 +526,12 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In
|
||||
<cfcatch type="ANY"></cfcatch>
|
||||
</cftry>
|
||||
<cfset local.qCfsParam.value_list = getListFromState(currentState, local.qCfsParam.state_path)/>
|
||||
</cfif>
|
||||
</cfif>
|
||||
|
||||
<cfif (len(local.qCfsParam.func) OR len(local.qCfsParam.expression) OR len(local.qCfsParam.state_path) OR len(local.qCfsParam.nested_ref))
|
||||
AND len(local.qCfsParam.value_list) EQ 0>
|
||||
<cfset local.qCfsParam.value_list = []/>
|
||||
</cfif>
|
||||
|
||||
<cfif local.qCfsParam.data_type EQ "map" OR local.qCfsParam.data_type EQ "map-fixed" OR local.qCfsParam.data_type EQ "array-map-fixed">
|
||||
<cfset processMap(local.qCfsParam)/><!--- query passed by reference --->
|
||||
|
||||
Reference in New Issue
Block a user