浏览代码

fix: use property db/ident instead of name

Tienson Qin 1 年之前
父节点
当前提交
13a5f91cd4
共有 2 个文件被更改,包括 6 次插入13 次删除
  1. 2 9
      deps/db/src/logseq/db/frontend/property.cljs
  2. 4 4
      src/main/frontend/handler/property/util.cljs

+ 2 - 9
deps/db/src/logseq/db/frontend/property.cljs

@@ -212,16 +212,9 @@
   [repo db block]
   (= :whiteboard-shape (get-block-property-value repo db block :logseq.property/ls-type)))
 
-(defn get-by-ident-or-name
-  "Gets a property by db-ident or name if it's a user property"
-  [db ident-or-name]
-  (if (and (keyword? ident-or-name) (namespace ident-or-name))
-    (d/entity db ident-or-name)
-    (d/entity db [:block/name (common-util/page-name-sanity-lc (name ident-or-name))])))
-
 (defn get-closed-property-values
-  [db ident-or-name]
-  (when-let [property (get-by-ident-or-name db ident-or-name)]
+  [db property-id]
+  (when-let [property (d/entity db property-id)]
     (get-in property [:block/schema :values])))
 
 (defn closed-value-name

+ 4 - 4
src/main/frontend/handler/property/util.cljs

@@ -54,13 +54,13 @@
     (db-property/shape-block? repo db block)))
 
 (defn get-closed-property-values
-  [property-name]
+  [property-id]
   (let [repo (state/get-current-repo)
         db (db/get-db repo)]
-    (db-property/get-closed-property-values db property-name)))
+    (db-property/get-closed-property-values db property-id)))
 
 (defn get-closed-value-entity-by-name
-  [property-name value-name]
+  [property-id value-name]
   (let [repo (state/get-current-repo)
         db (db/get-db repo)]
-    (db-property/get-closed-value-entity-by-name db property-name value-name)))
+    (db-property/get-closed-value-entity-by-name db property-id value-name)))