From 87d41700fc17c12fee3c29e2d383573970309b54 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 11 Dec 2019 16:34:57 +0100 Subject: [PATCH] :bug: Properly filter removed objects (backend). --- backend/src/uxbox/services/queries/project_files.clj | 1 + backend/src/uxbox/services/queries/project_pages.clj | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/src/uxbox/services/queries/project_files.clj b/backend/src/uxbox/services/queries/project_files.clj index 39a844449..06fa82135 100644 --- a/backend/src/uxbox/services/queries/project_files.clj +++ b/backend/src/uxbox/services/queries/project_files.clj @@ -34,6 +34,7 @@ where pu.user_id = $1 and pu.can_edit = true and pf.deleted_at is null + and pp.deleted_at is null window pages_w as (partition by pf.id order by pp.created_at range BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)") diff --git a/backend/src/uxbox/services/queries/project_pages.clj b/backend/src/uxbox/services/queries/project_pages.clj index 3ba860c5f..7a5375008 100644 --- a/backend/src/uxbox/services/queries/project_pages.clj +++ b/backend/src/uxbox/services/queries/project_pages.clj @@ -33,6 +33,7 @@ left join project_file_users as pfu on (pfu.file_id = pf.id) where ((pfu.user_id = $1 and pfu.can_edit = true) or (pu.user_id = $1 and pu.can_edit = true)) + and pp.deleted_at is null order by pp.created_at") ;; --- Query: Project Pages (By File ID)