diff --git a/v1/Application.cfc b/v1/Application.cfc index c13cb09..e3d885c 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.106"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.107"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); diff --git a/v1/resources/bookmark.cfc b/v1/resources/bookmark.cfc index 0f9201e..1c4ff56 100644 --- a/v1/resources/bookmark.cfc +++ b/v1/resources/bookmark.cfc @@ -19,7 +19,7 @@ - + select @@ -30,13 +30,14 @@ b.url b.icon_url b.contragent_id + b.sort b.is_enabled to_char(b.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created to_char(b.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated from bookmark b where b.bookmark_uid= - AND (b.contragent_id = ) + AND (b.contragent_id = OR b.contragent_id=-1) diff --git a/v1/resources/bookmark_ls.cfc b/v1/resources/bookmark_ls.cfc index 334aa55..76e06ca 100644 --- a/v1/resources/bookmark_ls.cfc +++ b/v1/resources/bookmark_ls.cfc @@ -52,7 +52,7 @@ - + select @@ -63,6 +63,7 @@ b.url b.icon_url b.contragent_id + b.sort b.is_enabled to_char(b.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created diff --git a/v1/resources/notification_ls.cfc b/v1/resources/notification_ls.cfc index 34cf1b0..52e453e 100644 --- a/v1/resources/notification_ls.cfc +++ b/v1/resources/notification_ls.cfc @@ -49,7 +49,7 @@ - + select diff --git a/v1/resources/resource_realm_ls.cfc b/v1/resources/resource_realm_ls.cfc index d2e35e0..f16bdc9 100644 --- a/v1/resources/resource_realm_ls.cfc +++ b/v1/resources/resource_realm_ls.cfc @@ -46,7 +46,7 @@ - + diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc index a5c9459..edab695 100644 --- a/v1/resources/svc_ls.cfc +++ b/v1/resources/svc_ls.cfc @@ -53,7 +53,7 @@ - +