diff --git a/v1/Application.cfc b/v1/Application.cfc index 1e80368..d95d154 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.057"; + variables.framework.docs.APIVersion="0.058"; variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index 12d27bd..7f0feb6 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -150,8 +150,8 @@ AND ( - e.display_name like - OR v.svc like + lower(e.display_name) like lower() + OR lower(v.svc) like lower() ) @@ -159,7 +159,7 @@ where 1=1 order by - limit #maxrows# + --limit #maxrows# @@ -173,6 +173,7 @@ join contragent k on (d.contragent_id=k.contragent_id) --join usr u on (k.contragent_id=u.contragent_id) join svc v on (e.service_id=v.svc_id) + where s.specification_id= @@ -181,21 +182,20 @@ - - - - - - - - - + - + + + + + + + - + + diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc index 72a4f71..07c3ca6 100644 --- a/v1/resources/instance_operation_cfs_param_ls.cfc +++ b/v1/resources/instance_operation_cfs_param_ls.cfc @@ -23,7 +23,7 @@ /> - + @@ -75,7 +75,7 @@ AND si.specification_id= order by - limit #maxrows# + --limit #maxrows# @@ -86,19 +86,20 @@ - - - - - - - - - + - + + + + + + + + + + @@ -154,13 +155,8 @@ - - - - + + insert into instance_operation_cfs_param ( instance_operation_cfs_param_uid,instance_operation_uid,svc_operation_cfs_param_id,param_value,note,dt_created,creator_id diff --git a/v1/resources/notification_ls.cfc b/v1/resources/notification_ls.cfc index 5b62c37..2c45763 100644 --- a/v1/resources/notification_ls.cfc +++ b/v1/resources/notification_ls.cfc @@ -69,7 +69,7 @@ AND (k.external_uid = OR n.contragent_id IS NULL) order by dt_show_from desc - limit #maxrows# + --limit #maxrows# @@ -85,19 +85,20 @@ - - - - - - - - - + - + + + + + + + + + + diff --git a/v1/resources/resource_realm_ls.cfc b/v1/resources/resource_realm_ls.cfc index c434d66..1928fc6 100644 --- a/v1/resources/resource_realm_ls.cfc +++ b/v1/resources/resource_realm_ls.cfc @@ -65,9 +65,10 @@ from resource_realm r join resource_realm_type t on (r.resource_realm_type_id=t.resource_realm_type_id) left outer join resource_realm p on (r.parent_id=p.resource_realm_id) + --join resource_realm_access a on a. where 1=1 order by - limit #maxrows# + --limit #maxrows# @@ -85,20 +86,20 @@ - - - - - - - - - - + - - + + + + + + + + + + + diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc index 36eda2c..ff28f1a 100644 --- a/v1/resources/svc_ls.cfc +++ b/v1/resources/svc_ls.cfc @@ -48,7 +48,7 @@ - + @@ -75,7 +75,7 @@ from svc s where 1=1 order by - limit #maxrows# + --limit #maxrows# @@ -94,28 +94,24 @@ - - - - - - - - - - + - + + + + + + + + + + - - \ No newline at end of file diff --git a/v1/resources/svc_operation.cfc b/v1/resources/svc_operation.cfc index 4caf9e0..1619441 100644 --- a/v1/resources/svc_operation.cfc +++ b/v1/resources/svc_operation.cfc @@ -39,7 +39,8 @@ p.value_list p.ref_svc_id p.is_required - p.default_value + p.default_value + p.default_compute p.regex p.unique_scope p.maxlength @@ -81,5 +82,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file