greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into whiteboards

pull/6850/head
Peng Xiao 2022-09-29 14:42:06 +08:00
parent 7bae8313d3 066496089f
commit 66739b5f41
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/frontend/handler/editor.cljs
View File

@ -1993,6 +1993,12 @@
root-block (db/pull db-id)
blocks-exclude-root (remove (fn [b] (= (:db/id b) db-id)) blocks)
sorted-blocks (tree/sort-blocks blocks-exclude-root root-block)
sorted-blocks (cons
(-> (first sorted-blocks)
(update :block/properties-text-values dissoc :template)
(update :block/properties-order (fn [keys]
(vec (remove #{:template} keys)))))
(rest sorted-blocks))
blocks (if template-including-parent?
sorted-blocks
(drop 1 sorted-blocks))]

6
src/main/frontend/handler/page.cljs
View File

@ -35,6 +35,7 @@
[promesa.core :as p]
[frontend.mobile.util :as mobile-util]
[logseq.graph-parser.util :as gp-util]
[logseq.graph-parser.text :as text]
[logseq.graph-parser.config :as gp-config]
[logseq.graph-parser.block :as gp-block]
[logseq.graph-parser.property :as gp-property]
@ -139,7 +140,10 @@
properties nil
split-namespace? true
uuid nil}}]
(let [title (string/trim title)
(let [title (-> (string/trim title)
(text/page-ref-un-brackets!)
;; remove `#` from tags
(string/replace #"^#+" ""))
title (gp-util/remove-boundary-slashes title)
page-name (util/page-name-sanity-lc title)
repo (state/get-current-repo)