diff --git a/backend/src/uxbox/services/queries/project_files.clj b/backend/src/uxbox/services/queries/project_files.clj index 39a8444494..06fa82135f 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 3ba860c5f5..7a53750086 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)