diff --git a/v1/Application.cfc b/v1/Application.cfc index 05f8bd1..ba4f179 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -22,26 +22,6 @@ - - - @@ -71,7 +51,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="Deck API"; - variables.framework.docs.APIVersion="0.041"; + variables.framework.docs.APIVersion="0.042";//новый номер variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; @@ -97,7 +77,17 @@ - ---> + ---> + + + + + + + + + + diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index dbf6b79..00bea88 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -91,6 +91,7 @@ round(extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)),1) as seconds_passed o.is_successful to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + o.error_log from instance_operation o left outer join (select instance_operation_uid, max(version) as version from instance_state @@ -328,8 +329,6 @@ - ---> - - + ---> \ No newline at end of file diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc index db83626..b48a235 100644 --- a/v1/resources/instance_operation_cfs_param.cfc +++ b/v1/resources/instance_operation_cfs_param.cfc @@ -27,7 +27,7 @@ iop.instance_operation_uid::text as instance_operation_uid iop.svc_operation_cfs_param_id iop.param_value - iop.descr + iop.note to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created iop.creator_id sop.svc_operation_cfs_param diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc index 09c013b..66a964d 100644 --- a/v1/resources/instance_operation_cfs_param_ls.cfc +++ b/v1/resources/instance_operation_cfs_param_ls.cfc @@ -187,7 +187,7 @@ - + @@ -233,6 +233,7 @@ +