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

fix: oops, wrong position for when-let

pull/2489/head
Tienson Qin 2021-08-03 16:30:04 +08:00
parent 5e9c3ed151
commit 0ec534fbcf
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2119,21 +2119,21 @@
([element-id db-id]
(insert-template! element-id db-id {}))
([element-id db-id opts]
(let [db-id (if (integer? db-id)
db-id
(:db/id (db-model/get-template-by-name (name db-id))))]
(when-let [repo (state/get-current-repo)
block (db/entity db-id)
format (:block/format block)
block-uuid (:block/uuid block)
template-including-parent? (not (false? (:template-including-parent (:block/properties block))))
blocks (db/get-block-and-children repo block-uuid)
level-blocks (vals (blocks-with-level blocks))
[root-block & blocks-exclude-root] level-blocks
root-block (assoc root-block :level 1)
sorted-blocks (tree/sort-blocks blocks-exclude-root root-block)
result-blocks (if template-including-parent? sorted-blocks (drop 1 sorted-blocks))
tree (blocks-vec->tree result-blocks)]
(when-let [db-id (if (integer? db-id)
db-id
(:db/id (db-model/get-template-by-name (name db-id))))]
(let [repo (state/get-current-repo)
block (db/entity db-id)
format (:block/format block)
block-uuid (:block/uuid block)
template-including-parent? (not (false? (:template-including-parent (:block/properties block))))
blocks (db/get-block-and-children repo block-uuid)
level-blocks (vals (blocks-with-level blocks))
[root-block & blocks-exclude-root] level-blocks
root-block (assoc root-block :level 1)
sorted-blocks (tree/sort-blocks blocks-exclude-root root-block)
result-blocks (if template-including-parent? sorted-blocks (drop 1 sorted-blocks))
tree (blocks-vec->tree result-blocks)]
(when element-id
(insert-command! element-id "" format {}))
(let [opts (merge