diff --git a/v1/Application.cfc b/v1/Application.cfc
index be13609..4d2b205 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -51,7 +51,7 @@
//variables.framework.docs={};
variables.framework.docs.APIName="Deck API";
- variables.framework.docs.APIVersion="0.112"; /*$ git config --global --unset user.password*/
+ variables.framework.docs.APIVersion="0.113"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew();
diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc
index fb5441c..a70cd35 100644
--- a/v1/resources/instance.cfc
+++ b/v1/resources/instance.cfc
@@ -34,7 +34,9 @@
i.price
v.svc
v.code
- v.man
+ v.man
+
+
e.updater_id
u.login as updater_login
u.shortname as updater_shortname
diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc
index 0b3e523..a503b0f 100644
--- a/v1/resources/instance_ls.cfc
+++ b/v1/resources/instance_ls.cfc
@@ -33,6 +33,7 @@
"instance_state_uid"={prefix="inr", type="guid"},
"is_deleted"={prefix="inr", type="string"},
"is_suspended"={prefix="inr", type="string"},
+ "job_is_pending"={prefix="inr", type="string"},
"resource_realm"={prefix="inr", type="string"},
"operation_is_in_progress"={prefix="inr", type="boolean"},
"operation_is_pending"={prefix="inr", type="boolean"},
@@ -174,15 +175,16 @@
st.is_test as is_test
coalesce(st.instance_data->>'isDeleted','false') as is_deleted
st.instance_data->>'isSuspended' as is_suspended
- cast(st.instance_data->>'params' as json)->>'resourceRealm' as resource_realm
+ st.instance_data->'job'->>'pending' as job_is_pending
+ st.instance_data->'params'->>'resourceRealm' as resource_realm
to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state
(case
when st.instance_uid IS NULL then 'not created'
+ when job_is_pending = 'true' then 'pending'
when st.is_deleted = 'true' then 'deleted'
when st.is_suspended = 'true' then 'suspended'
- /*when coalesce(st.is_deleted,'false') = 'false' AND coalesce(st.is_suspended, 'false') = 'false' then 'running'*/
when coalesce(st.is_deleted,'false') = 'false' AND coalesce(st.is_suspended, 'false') = 'false' then 'running'
when io.instance_uid IS NULL then 'not configured'
else null end
@@ -212,14 +214,16 @@
left outer join (select ist.instance_state_uid, ist.instance_uid, ist.version, ist.dt_state, ist.is_test
,(ist.instance_data->>'isSuspended') as is_suspended
,(ist.instance_data->>'isDeleted') as is_deleted
+ ,(ist.instance_data->'job'->>'pending') as job_is_pending
,ist.instance_data
- from instance_state ist join (select instance_uid, max(version) as version from instance_state group by 1) lastv
- on (ist.instance_uid=lastv.instance_uid AND ist.version=lastv.version) ) st
- on (e.instance_uid=st.instance_uid)
+ from instance_state ist
+ join (select instance_uid, max(version) as version from instance_state group by 1) lastv
+ on (ist.instance_uid=lastv.instance_uid AND ist.version=lastv.version)
+ ) st on (e.instance_uid=st.instance_uid)
left outer join (select o.instance_operation_uid, o.instance_uid, o.operation, o.dt_submit, o.submit_result, o.dt_start, o.dt_finish, o.is_successful
- from instance_operation o join (select instance_uid, max(dt_submit) as dt_submit from instance_operation group by 1) lastv
- on (o.instance_uid=lastv.instance_uid AND o.dt_submit=lastv.dt_submit) ) io
- on (e.instance_uid=io.instance_uid)
+ from instance_operation o join (select instance_uid, max(dt_submit) as dt_submit from instance_operation group by 1
+ ) lastv on (o.instance_uid=lastv.instance_uid AND o.dt_submit=lastv.dt_submit)
+ ) io on (e.instance_uid=io.instance_uid)
where s.specification_id=
AND (
@@ -248,6 +252,7 @@
left outer join (select ist.instance_state_uid, ist.instance_uid, ist.version, ist.dt_state, ist.is_test
,(ist.instance_data->>'isSuspended') as is_suspended
,(ist.instance_data->>'isDeleted') as is_deleted
+ ,(ist.instance_data->'job'->>'pending') as job_is_pending
,ist.instance_data
from instance_state ist join (select instance_uid, max(version) as version from instance_state group by 1) lastv
on (ist.instance_uid=lastv.instance_uid AND ist.version=lastv.version) ) st