074 is_sensitive
This commit is contained in:
msyu
+1
-1
@@ -51,7 +51,7 @@
|
||||
|
||||
//variables.framework.docs={};
|
||||
variables.framework.docs.APIName="Deck API";
|
||||
variables.framework.docs.APIVersion="0.073";
|
||||
variables.framework.docs.APIVersion="0.074";
|
||||
|
||||
variables.framework.globalHeaders = structNew();
|
||||
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
|
||||
|
||||
@@ -113,6 +113,7 @@
|
||||
<m:field>sop.descr</m:field>
|
||||
<m:field>sop.sort</m:field>
|
||||
<m:field>iop.note</m:field>
|
||||
<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
|
||||
</m:field_set>
|
||||
from svc_operation_cfs_param sop
|
||||
left outer join instance_operation_cfs_param iop
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<m:field>sop.svc_operation_cfs_param</m:field>
|
||||
<m:field>u.login as creator_login</m:field>
|
||||
<m:field>u.shortname as creator_shortname</m:field>
|
||||
<m:field>sop.is_sensitive</m:field>
|
||||
<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
|
||||
</m:field_set>
|
||||
from instance_operation_cfs_param iop
|
||||
join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id)
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
<m:field>u.shortname as creator_shortname</m:field>
|
||||
<m:field>sop.svc_operation_cfs_param</m:field>
|
||||
<m:field>sop.sort</m:field>
|
||||
<m:field>sop.is_sensitive</m:field>
|
||||
<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
|
||||
</m:field_set>
|
||||
from instance_operation_cfs_param iop
|
||||
join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid)
|
||||
|
||||
@@ -61,7 +61,8 @@
|
||||
where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
|
||||
order by c.svc_operation_cfs_param_id
|
||||
limit 1
|
||||
) as isModifiable</m:field>
|
||||
) as is_modifiable</m:field>
|
||||
<m:field formatter=#request.castToBool#>p.is_sensitive</m:field>
|
||||
</m:field_set>
|
||||
from svc_operation_cfs_param p
|
||||
where p.svc_operation_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcOperationId#" null=#!isValid('integer',arguments.svcOperationId)#/>
|
||||
|
||||
@@ -94,33 +94,13 @@
|
||||
<cfreturn noData().withStatus(201, "Created") />
|
||||
</cffunction>
|
||||
|
||||
|
||||
|
||||
|
||||
<cffunction name="generateRfsParams">
|
||||
<cfargument name="instanceOperationUid" type="guid"/>
|
||||
<cfargument name="usrId" type="numeric"/>
|
||||
<cfargument name="contragentId" type="numeric"/>
|
||||
<cfargument name="contractId" type="numeric"/>
|
||||
|
||||
<!---
|
||||
-- полезный селект, не выбрасывать
|
||||
<cfquery name="qSvcOperationCfsParam">
|
||||
select sop.svc_operation_cfs_param_id
|
||||
,iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid /*pgjdbc issue fix*/
|
||||
,iop.param_value
|
||||
,sop.svc_operation_cfs_param
|
||||
,sop.data_type
|
||||
,sop.is_required
|
||||
,sop.maxlength,sop.minlength,sop.regex,sop.unique_scope
|
||||
from instance_operation io
|
||||
join instance e on (io.instance_uid=e.instance_uid)
|
||||
join svc_operation so on (e.service_id=so.svc_id AND io.operation=so.operation)
|
||||
join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id)
|
||||
left outer join instance_operation_cfs_param iop
|
||||
on (sop.svc_operation_cfs_param_id=iop.svc_operation_cfs_param_id AND io.instance_operation_uid=iop.instance_operation_uid)
|
||||
where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid# null=#!isValid("guid",arguments.instanceOperationUid)#/>)
|
||||
</cfquery>
|
||||
--->
|
||||
<cfargument name="contractId" type="numeric"/>
|
||||
|
||||
<cfquery name="qSvcOperation">
|
||||
select so.svc_operation_id, io.instance_uid, so.operation
|
||||
from instance_operation io
|
||||
@@ -133,7 +113,7 @@
|
||||
<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "operationUid", arguments.instanceOperationUid)/>
|
||||
<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "modifierId", arguments.usrId)/>
|
||||
|
||||
<cfif qSvcOperation.operation EQ "create"/><!--- несколько костыльно --->
|
||||
<cfif qSvcOperation.operation EQ "create"><!--- несколько костыльно --->
|
||||
<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "billingObject", "underconstruction")/>
|
||||
<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "contragentCode", getContragentCode(arguments.contragentId))/>
|
||||
</cfif>
|
||||
@@ -154,8 +134,6 @@
|
||||
</cfquery>
|
||||
|
||||
<!--- так яснее, но можно было все в один запрос --->
|
||||
|
||||
|
||||
<cfquery name="qWriteRfsParamsFromDefaults">
|
||||
insert into instance_operation_param (instance_operation_uid,param,param_value)
|
||||
select
|
||||
@@ -167,10 +145,29 @@
|
||||
/*PostgreSQL specific*/
|
||||
ON CONFLICT (instance_operation_uid,param)
|
||||
DO NOTHING;
|
||||
</cfquery>
|
||||
|
||||
</cfquery>
|
||||
</cffunction>
|
||||
|
||||
<!---
|
||||
-- полезный селект, не выбрасывать
|
||||
<cfquery name="qSvcOperationCfsParam">
|
||||
select sop.svc_operation_cfs_param_id
|
||||
,iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid /*pgjdbc issue fix*/
|
||||
,iop.param_value
|
||||
,sop.svc_operation_cfs_param
|
||||
,sop.data_type
|
||||
,sop.is_required
|
||||
,sop.maxlength,sop.minlength,sop.regex,sop.unique_scope
|
||||
from instance_operation io
|
||||
join instance e on (io.instance_uid=e.instance_uid)
|
||||
join svc_operation so on (e.service_id=so.svc_id AND io.operation=so.operation)
|
||||
join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id)
|
||||
left outer join instance_operation_cfs_param iop
|
||||
on (sop.svc_operation_cfs_param_id=iop.svc_operation_cfs_param_id AND io.instance_operation_uid=iop.instance_operation_uid)
|
||||
where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid# null=#!isValid("guid",arguments.instanceOperationUid)#/>)
|
||||
</cfquery>
|
||||
--->
|
||||
|
||||
<cffunction name="submitJob">
|
||||
<cfargument name="instanceOperationUid" type="string" required=true hint="type:guid"/>
|
||||
|
||||
|
||||
@@ -58,7 +58,8 @@
|
||||
where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
|
||||
order by c.svc_operation_cfs_param_id
|
||||
limit 1
|
||||
) as isModifiable</m:field>
|
||||
) as is_modifiable</m:field>
|
||||
<m:field formatter=#request.castToBool#>p.is_sensitive</m:field>
|
||||
</m:field_set>
|
||||
from svc_operation_cfs_param p
|
||||
where p.svc_operation_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcOperationId#" null=#!isValid('integer',arguments.svcOperationId)#/>
|
||||
|
||||
Reference in New Issue
Block a user