Browse Source

fix: template fails upon selection

fixes LOG-3066
Tienson Qin 1 year ago
parent
commit
6ec980351a
1 changed files with 7 additions and 6 deletions
  1. 7 6
      src/main/frontend/handler/editor.cljs

+ 7 - 6
src/main/frontend/handler/editor.cljs

@@ -2152,9 +2152,9 @@
    (let [repo (state/get-current-repo)
    (let [repo (state/get-current-repo)
          db? (config/db-based-graph? repo)]
          db? (config/db-based-graph? repo)]
      (when-not db?
      (when-not db?
-       (let [block (if (integer? db-id)
-                     (db-async/<pull repo db-id)
-                     (db-async/<get-template-by-name (name db-id)))]
+       (p/let [block (if (integer? db-id)
+                       (db-async/<pull repo db-id)
+                       (db-async/<get-template-by-name (name db-id)))]
          (when-let [db-id (:db/id block)]
          (when-let [db-id (:db/id block)]
            (let [journal? (:block/journal? target)
            (let [journal? (:block/journal? target)
                  target (or target (state/get-edit-block))
                  target (or target (state/get-edit-block))
@@ -2215,9 +2215,10 @@
 
 
 (defn template-on-chosen-handler
 (defn template-on-chosen-handler
   [element-id]
   [element-id]
-  (fn [[_template db-id] _click?]
-    (insert-template! element-id db-id
-                      {:replace-empty-target? true})))
+  (fn [[_template template-block] _click?]
+    (when-let [db-id (:db/id template-block)]
+      (insert-template! element-id db-id
+                        {:replace-empty-target? true}))))
 
 
 (defn get-searching-property
 (defn get-searching-property
   [input]
   [input]