diff --git a/v1/Application.cfc b/v1/Application.cfc index 19f3eca..c13cb09 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.105"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.106"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); diff --git a/v1/resources/bookmark_ls.cfc b/v1/resources/bookmark_ls.cfc index 4544baf..334aa55 100644 --- a/v1/resources/bookmark_ls.cfc +++ b/v1/resources/bookmark_ls.cfc @@ -71,7 +71,8 @@ from bookmark b /*left outer join contragent k on (b.contragent_id=k.contragent_id)*/ where 1=1 - AND (b.contragent_id = ) + AND (b.contragent_id = + OR b.contragent_id=-1)/*общая букмарка*/ order by sort desc limit #maxrows#