From 76bab252ecd3822dca189ea3718284c8d5089e8d Mon Sep 17 00:00:00 2001 From: David Vargas Date: Mon, 29 Aug 2022 14:57:11 -0400 Subject: [PATCH] Add an option to skip redirect on page rename --- src/main/frontend/handler/page.cljs | 47 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs index 2b02e0773..7232aacfd 100644 --- a/src/main/frontend/handler/page.cljs +++ b/src/main/frontend/handler/page.cljs @@ -559,31 +559,32 @@ (defn rename! "Accepts unsanitized page names" - [old-name new-name] - (let [repo (state/get-current-repo) - old-name (string/trim old-name) - new-name (string/trim new-name) - old-page-name (util/page-name-sanity-lc old-name) - new-page-name (util/page-name-sanity-lc new-name) - name-changed? (not= old-name new-name)] - (if (and old-name - new-name - (not (string/blank? new-name)) - name-changed?) - (do - (cond - (= old-page-name new-page-name) - (rename-page-aux old-name new-name true) + ([old-name new-name] (rename! old-name new-name true)) + ([old-name new-name redirect?] + (let [repo (state/get-current-repo) + old-name (string/trim old-name) + new-name (string/trim new-name) + old-page-name (util/page-name-sanity-lc old-name) + new-page-name (util/page-name-sanity-lc new-name) + name-changed? (not= old-name new-name)] + (if (and old-name + new-name + (not (string/blank? new-name)) + name-changed?) + (do + (cond + (= old-page-name new-page-name) + (rename-page-aux old-name new-name redirect?) - (db/pull [:block/name new-page-name]) - (merge-pages! old-page-name new-page-name) + (db/pull [:block/name new-page-name]) + (merge-pages! old-page-name new-page-name) - :else - (rename-namespace-pages! repo old-name new-name)) - (rename-nested-pages old-name new-name)) - (when (string/blank? new-name) - (notification/show! "Please use a valid name, empty name is not allowed!" :error))) - (ui-handler/re-render-root!))) + :else + (rename-namespace-pages! repo old-name new-name)) + (rename-nested-pages old-name new-name)) + (when (string/blank? new-name) + (notification/show! "Please use a valid name, empty name is not allowed!" :error))) + (ui-handler/re-render-root!)))) (defn- split-col-by-element [col element]