103 bookmark fixes

v1/resources/instance_operation.cfc

@@ -113,6 +113,7 @@
 				<m:field>sop.svc_operation_cfs_param</m:field>				
 				<m:field>sop.label</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);}#>sop.value_list</m:field>
 				<m:field>sop.ref_svc_id</m:field>
 				<m:field>sop.func</m:field>
@@ -149,9 +150,81 @@
 				<!--- <cfdump var=#local.qCfsParam#/><cfabort/> --->
 				<cfif len(trim(local.qCfsParam.value_list)) AND listLen(local.qCfsParam.value_list) EQ 1>
 					<cfset local.qCfsParam.default_value=local.qCfsParam.value_list/>
-				</cfif>
-				
+				</cfif>				
 			</cfif>		
+			
+			<cfif data_type EQ "map">
+				<cfset var map={}/>
+				<cftry>
+					<cfset var map=deserializeJson(param_value)/>
+					<cfcatch type="any"><cfrethrow/></cfcatch>
+				</cftry>
+				
+				<cfquery name="local.qSubparam">
+				select 
+					 sp.svc_operation_cfs_param_id
+					,sp.svc_operation_cfs_subparam_id
+					,sp.svc_operation_cfs_subparam
+					,sp.label
+					,sp.data_type
+					,sp.value_list
+					,sp.is_required
+					,sp.descr
+					,sp.man
+					,sp.default_value
+					,sp.minlength
+					,sp.maxlength				
+					,sp.regex
+					,sp.sort
+					,sp.is_sensitive
+				from svc_operation_cfs_subparam sp
+				where sp.svc_operation_cfs_param_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#svc_operation_cfs_param_id#"/>
+				order by sp.sort
+				</cfquery>
+				
+				<cfquery name="local.qInstSubparam">
+				select 
+					 sp.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid
+					,sp.instance_operation_cfs_subparam								
+					,sp.descr								
+					,sp.sort
+					,sp.is_sensitive
+				from instance_operation_cfs_subparam sp
+				where sp.instance_operation_cfs_param_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#instance_operation_cfs_param_uid#" null=#!isValid("guid",instance_operation_cfs_param_uid)#/>
+				order by sp.sort
+				</cfquery>
+			
+				<cfset var mapDescriptor=structNew("linked")/>
+				
+				<cfloop query="local.qSubparam">
+					<cfset structInsert(mapDescriptor, local.qSubparam.svc_operation_cfs_subparam,
+							{
+								"man":"#local.qSubparam.man#", 
+								"isSensitive":#request.castToBool(local.qSubparam.is_sensitive)#
+							}, true
+						)
+					/>
+					<cfif local.qSubparam.is_sensitive AND structKeyExists(map,local.qSubparam.svc_operation_cfs_subparam)>
+						<cfset map["#local.qSubparam.svc_operation_cfs_subparam#"] = "********"/>
+					</cfif>
+				</cfloop>
+				
+				<cfloop query="local.qInstSubparam">
+					<cfset structInsert(mapDescriptor, local.qInstSubparam.instance_operation_cfs_subparam,
+							{
+								"note":"#local.qInstSubparam.note#", 
+								"isSensitive":#request.castToBool(local.qInstSubparam.is_sensitive)#
+							}, true
+						)
+					/>
+					<cfif local.qInstSubparam.is_sensitive AND structKeyExists(map,local.qInstSubparam.instance_operation_cfs_subparam)>
+						<cfset map["#local.qInstSubparam.instance_operation_cfs_subparam#"] = "********"/>
+					</cfif>
+				</cfloop>
+				
+				<cfset local.qCfsParam.data_descriptor = mapDescriptor/>				
+				<cfset local.qCfsParam.param_value = serializeJson(map)/>				
+			</cfif><!---/map --->
 		</cfloop>