From 14e4af295781a00aacdb9104bda9c8121000b2cb Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Wed, 6 Jan 2021 16:42:39 +0800 Subject: [PATCH] enhance: alias don't redirect to source page in the page properties --- src/main/frontend/components/block.cljs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index 3adaebc5e6..4ad9b0d26c 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -251,9 +251,15 @@ (string/capitalize original-page-name) original-page-name) page (string/lower-case page-name) - redirect-page-name (if (db/page-empty? (state/get-current-repo) page-name) + redirect-page-name (cond + (:page/alias? config) + page + + (db/page-empty? (state/get-current-repo) page-name) (or (when source-page (:page/name source-page)) page) + + :else page) href (if html-export? (util/encode-str page) @@ -1696,7 +1702,9 @@ (if (coll? v) (let [vals (for [item v] (if (coll? v) - (page-cp config {:page/name item}) + (let [config (if (= k :alias) + (assoc config :page/alias? true))] + (page-cp config {:page/name item})) (inline-text format item)))] (interpose [:span ", "] vals)) (inline-text format v))])))]