diff --git a/v1/Application.cfc b/v1/Application.cfc index 8e87641..27c0d9e 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.099"; + variables.framework.docs.APIVersion="0.100"; variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc index b0e4ada..c055f43 100644 --- a/v1/resources/instance_operation.cfc +++ b/v1/resources/instance_operation.cfc @@ -147,29 +147,14 @@ }/> + + + + - - + - - @@ -214,7 +194,7 @@ AND a.is_enabled) join svc s on r.resource_realm_type_id=s.resource_realm_type_id where s.svc_id= - order by 1 + order by r.sort diff --git a/v1/resources/instance_operation_default.cfc b/v1/resources/instance_operation_default.cfc index 6736c3c..dcddb63 100644 --- a/v1/resources/instance_operation_default.cfc +++ b/v1/resources/instance_operation_default.cfc @@ -1,4 +1,5 @@ - + + @@ -7,18 +8,23 @@ + - - - - + + - + + + + + + + select @@ -30,9 +36,32 @@ o.man from svc_operation o - where o.svc_operation_id= + where o.svc_operation_id= + + + + + + + + select instance_data->'params' as params + from instance_state + where instance_uid= + order by version desc + limit 1 + + + + + + + + + + + select @@ -70,13 +99,10 @@ from svc_operation_cfs_param p where p.svc_operation_id= order by p.sort, p.svc_operation_cfs_param_id - - - - - - + + + + + + - - + - - - @@ -122,21 +129,21 @@ + + + + + + + + - - - - - @@ -164,28 +171,6 @@ - - - select distinct r.resource_realm - from resource_realm r - join resource_realm_access a on - (r.resource_realm_id=a.resource_realm_id - AND (a.contract_id= - OR a.contract_id=0) /*0 means access to any contract*/ - AND a.is_enabled) - join svc s on r.resource_realm_type_id=s.resource_realm_type_id - where s.svc_id= - order by 1 - - - ---> -