clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-29 00:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: creating new pages from bracketing text is broken #4971

Browse Source 
close #4971
This commit is contained in:
Tienson Qin
2022-04-21 22:55:50 +08:00
parent 067f25f4bc
commit 403bb10b14
13 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,8 +95,9 @@
split-namespace? true}}]
(let [title (string/trim title)
title (util/remove-boundary-slashes title)
page-name (util/page-name-sanity-lc title)]
(when-not (db/entity [:block/name page-name])
page-name (util/page-name-sanity-lc title)
repo (state/get-current-repo)]
(when-not (db/page-exists? page-name)
(let [pages (if split-namespace?
(util/split-namespace-pages title)
[title])
@@ -104,7 +105,7 @@
pages (map (fn [page]
(-> (block/page-name->map page true)
(assoc :block/format format)))
pages)
pages)
txs (->> pages
;; for namespace pages, only last page need properties
drop-last
@@ -112,19 +113,15 @@
(remove nil?))
last-txs (build-page-tx format properties (last pages) journal?)
txs (concat txs last-txs)]
(db/transact! txs)))
;; (util/pprint txs)
(db/transact! txs)
(when create-first-block?
(when (db/page-empty? repo (:db/id (db/entity [:block/name page-name])))
(editor-handler/api-insert-new-block! "" {:page page-name})))
(when create-first-block?
(editor-handler/insert-first-page-block-if-not-exists! page-name))
(when-let [page (db/entity [:block/name page-name])]
(outliner-file/sync-to-file page))
(when redirect?
(route-handler/redirect-to-page! page-name))
page-name)))))
(when redirect?
(route-handler/redirect-to-page! page-name))
page-name)))
(defn delete-file!
[repo page-name]
@@ -453,16 +450,11 @@
(p/let [_ (rename-page-aux old-page-title new-page-title redirect?)]
(println "Renamed " old-page-title " to " new-page-title)))))))
(defn page-exists?
[page-name]
(when page-name
(db/entity [:block/name (util/page-name-sanity-lc page-name)])))
(defn merge-pages!
"Only accepts sanitized page names"
[from-page-name to-page-name]
(when (and (page-exists? from-page-name)
(page-exists? to-page-name)
(when (and (db/page-exists? from-page-name)
(db/page-exists? to-page-name)
(not= from-page-name to-page-name))
(let [to-page (db/entity [:block/name to-page-name])
to-id (:db/id to-page)