115 job url split version from state

This commit is contained in:
msyu
2025-06-18 20:31:00 +03:00
parent a1acf0833b
commit ffdb01d9e4
2 changed files with 19 additions and 3 deletions
+1 -1
View File
@@ -51,7 +51,7 @@
//variables.framework.docs={};
variables.framework.docs.APIName="Deck API";
variables.framework.docs.APIVersion="0.114"; /*$ git config --global --unset user.password*/
variables.framework.docs.APIVersion="0.115"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew();
+18 -2
View File
@@ -188,12 +188,22 @@
<cfargument name="instanceOperationUid" type="string" required=true hint="type:guid"/>
<cfquery name="qInstanceOperation">
select select so.url_prefix, so.url_suffix, o.operation, svc.version
select so.url_prefix, so.url_suffix, o.operation, svc.version
from instance_operation o
join instance i on (o.instance_uid=i.instance_uid)
join svc on (i.service_id=svc.svc_id)
left outer join svc_operation so on (i.service_id=so.svc_id AND o.operation=so.operation)
where o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
</cfquery>
<cfquery name="qState">
select s.instance_data->'job'->>'jobAppVersion' as jobAppVersion
from instance_operation o
join instance_state s on (o.instance_uid=s.instance_uid)
where o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
order by s.version desc
limit 1
</cfquery>
<cfquery name="qInstanceOperationParam">
select iop.param, iop.param_value
@@ -202,8 +212,14 @@
AND length(iop.param)>0
</cfquery>
<cfif len(qState.jobAppVersion)>
<cfset var submit_url="#qInstanceOperation.url_prefix##qState.jobAppVersion##qInstanceOperation.url_suffix#"/>
<cfelse>
<cfset var submit_url="#qInstanceOperation.url_prefix##qInstanceOperation.version##qInstanceOperation.url_suffix#"/>
</cfif>
<!--- *** тут нужно бы указать, кто запустил операцию --->
<cfset submit_url="#qInstanceOperation.url_prefix##qInstanceOperation.version##qInstanceOperation.url_suffix#"/>
<cfquery name="qMarkOperationStart">
update instance_operation
set dt_submit=<cfqueryparam cfsqltype="cf_sql_timestamp" value=#now()#/>