103 bookmark fixes

v1/resources/instance_operation_cfs_param.cfc

@@ -20,6 +20,8 @@
 			</cfcatch>
 		</cftry>
 		
+		<cfset local={}/>
+		
 		<cfquery name="local.qRead" result="local.result">
 			select 
 			<m:field_set titleMapOut="local.titleMap" lengthOut="fieldCount">
@@ -32,6 +34,8 @@
 				<m:field>to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
 				<m:field>iop.creator_id</m:field>
 				<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>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>
@@ -50,6 +54,80 @@
 			<cfreturn representationOf(this.helper.formatMessage("Not Found")).withStatus(404)/>
 		</cfif>
 		
+		
+		<cfif local.qRead.data_type EQ "map">
+			<cfset var map={}/>
+			<cftry>
+				<cfset var map=deserializeJson(local.qRead.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="#local.qRead.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.note								
+				,sp.sort
+				,sp.is_sensitive
+			from instance_operation_cfs_subparam sp
+			where sp.instance_operation_cfs_param_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#local.qRead.instance_operation_cfs_param_uid#" null=#!isValid("guid",local.qRead.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 --->
+		
 		<cfset var out=structNew("linked")/>
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>