fix: can't save block after deleting a page

Resolved #736
pull/750/head
Tienson Qin 2020-11-25 12:16:02 +08:00
parent b8dc610cc0
commit 1432cf053b
3 changed files with 10 additions and 4 deletions

View File

@ -55,7 +55,7 @@
(let [raw-blocks (db/get-page-blocks repo page)
document-mode? (state/sub :document/mode?)
blocks (->>
(db/with-dummy-block raw-blocks format nil true)
(db/with-dummy-block raw-blocks format nil {:journal? true})
(db/with-block-refs-count repo))]
(blocks-inner blocks encoded-page-name page document-mode?)))

View File

@ -63,7 +63,8 @@
(let [file-id (:db/id (:page/file page))]
{:start-pos (utf8/length (utf8/encode content))
:end-pos nil})}))
journal?)
{:journal? journal?
:page-name page-name})
start-level (or (:block/level (first page-blocks)) 1)
hiccup-config {:id encoded-page-name
:start-level start-level
@ -80,6 +81,7 @@
(defn contents-page
[{:page/keys [name original-name file] :as contents}]
(prn {:contents contents})
(when-let [repo (state/get-current-repo)]
(let [format (db/get-page-format name)
file-path (:file/path file)]
@ -252,6 +254,9 @@
(->> (:db/id (:block/page (db/entity repo [:block/uuid block-id])))
(db/entity repo))
(db/entity repo [:page/name page-name]))
page (if page page (do
(db/transact! repo [{:page/name page-name}])
(db/entity repo [:page/name page-name])))
properties (:page/properties page)
page-name (:page/name page)
page-original-name (:page/original-name page)

View File

@ -1567,8 +1567,9 @@
(defn with-dummy-block
([blocks format]
(with-dummy-block blocks format {} false))
([blocks format default-option journal?]
(with-dummy-block blocks format {} {}))
([blocks format default-option {:keys [journal? page-name]
:or {journal? false}}]
(let [format (or format (state/get-preferred-format) :markdown)
blocks (if (and journal?
(seq blocks)