From d3f0bd5fa4ef561f886f9e1013793b7e48a81e9d Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Thu, 9 Dec 2021 22:40:50 +0800 Subject: [PATCH] fix: Problem keeping separate graphs separated close #3309 --- src/main/frontend/db/model.cljs | 10 ++++++---- src/main/frontend/handler/file.cljs | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs index 713f6abf3a..5dda9440d8 100644 --- a/src/main/frontend/db/model.cljs +++ b/src/main/frontend/db/model.cljs @@ -699,10 +699,12 @@ first))))) (defn get-page-file - [page-name] - (some-> (or (db-utils/entity [:block/name page-name]) - (db-utils/entity [:block/original-name page-name])) - :block/file)) + ([page-name] + (get-page-file (state/get-current-repo) page-name)) + ([repo page-name] + (some-> (or (db-utils/entity repo [:block/name page-name]) + (db-utils/entity repo [:block/original-name page-name])) + :block/file))) (defn get-block-file-path [block] diff --git a/src/main/frontend/handler/file.cljs b/src/main/frontend/handler/file.cljs index 1d25d78250..ad22d04376 100644 --- a/src/main/frontend/handler/file.cljs +++ b/src/main/frontend/handler/file.cljs @@ -125,9 +125,9 @@ data))) (defn- page-exists-in-another-file - [page file] + [repo-url page file] (when-let [page-name (:block/name page)] - (let [current-file (:file/path (db/get-page-file page-name))] + (let [current-file (:file/path (db/get-page-file repo-url page-name))] (when (not= file current-file) current-file)))) @@ -164,7 +164,7 @@ (db/delete-file-blocks! repo-url file) (when first-page (db/delete-page-blocks repo-url (:block/name first-page)))) (distinct)) - _ (when-let [current-file (page-exists-in-another-file first-page file)] + _ (when-let [current-file (page-exists-in-another-file repo-url first-page file)] (when (not= file current-file) (let [error (str "Page already exists with another file: " current-file ", current file: " file)] (state/pub-event! [:notification/show