From c54f4ba3a996ce5c796c723af4a211563044e370 Mon Sep 17 00:00:00 2001 From: charlie Date: Mon, 22 Feb 2021 18:09:13 +0800 Subject: [PATCH] fix(desktop): Desktop client cannot delete files #1346 --- src/main/frontend/handler/file.cljs | 4 ++-- src/main/frontend/handler/page.cljs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/frontend/handler/file.cljs b/src/main/frontend/handler/file.cljs index 0f37f3fca..252ab78e8 100644 --- a/src/main/frontend/handler/file.cljs +++ b/src/main/frontend/handler/file.cljs @@ -278,7 +278,7 @@ [repo file] (when-not (string/blank? file) (-> - (p/let [_ (git/remove-file repo file) + (p/let [_ (or (config/local-db? repo) (git/remove-file repo file)) result (fs/unlink! (config/get-repo-path repo file) nil)] (when-let [file (db/entity repo [:file/path file])] (common-handler/check-changed-files-status) @@ -291,7 +291,7 @@ (when (seq tx-data) (db/transact! repo tx-data))))) (p/catch (fn [err] - (prn "error: " err)))))) + (js/console.error "error: " err)))))) (defn re-index! [file] diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs index f364834bc..e3f16a39d 100644 --- a/src/main/frontend/handler/page.cljs +++ b/src/main/frontend/handler/page.cljs @@ -278,12 +278,12 @@ (db/transact! tx-data) ;; remove file (-> - (p/let [_ (git/remove-file repo file-path) + (p/let [_ (or (config/local-db? repo) (git/remove-file repo file-path)) _ (fs/unlink! (config/get-repo-path repo file-path) nil)] (common-handler/check-changed-files-status) (repo-handler/push-if-auto-enabled! repo)) (p/catch (fn [err] - (prn "error: " err)))))) + (js/console.error "error: " err)))))) (db/transact! [[:db.fn/retractEntity [:page/name page-name]]])