Browse Source

fix: Task descendant object added Task tag

when Status added. Fixes
https://test.logseq.com/#/page/675326b3-7e92-4cf0-b9d3-cc367049b920.
Also fixes class-instance? not working for parent classes
Gabriel Horner 1 year ago
parent
commit
b89a4925d8
2 changed files with 7 additions and 7 deletions
  1. 2 2
      deps/db/src/logseq/db.cljs
  2. 5 5
      deps/outliner/src/logseq/outliner/property.cljs

+ 2 - 2
deps/db/src/logseq/db.cljs

@@ -576,8 +576,8 @@
         tags-ids (set (map :db/id tags))]
     (or
      (contains? tags-ids (:db/id class))
-     (let [class-parents (get-classes-parents tags)]
-       (contains? (set/union class-parents tags-ids) (:db/id class))))))
+     (let [class-parent-ids (set (map :db/id (get-classes-parents tags)))]
+       (contains? (set/union class-parent-ids tags-ids) (:db/id class))))))
 
 (defn get-all-pages-views
   [db]

+ 5 - 5
deps/outliner/src/logseq/outliner/property.cljs

@@ -37,15 +37,15 @@
            retract-multiple-values? (and multiple-values? (sequential? value))
            multiple-values-empty? (and (sequential? old-value)
                                        (contains? (set (map :db/ident old-value)) :logseq.property/empty-placeholder))
-           block (assoc (outliner-core/block-with-updated-at {:db/id (:db/id block)})
+           block' (assoc (outliner-core/block-with-updated-at {:db/id (:db/id block)})
                         property-id value)
-           block-tx-data (cond-> block
-                           status?
+           block-tx-data (cond-> block'
+                           (and status? (not (ldb/class-instance? (d/entity @conn :logseq.class/Task) block)))
                            (assoc :block/tags :logseq.class/Task))]
        [(when multiple-values-empty?
-          [:db/retract (:db/id block) property-id :logseq.property/empty-placeholder])
+          [:db/retract (:db/id block') property-id :logseq.property/empty-placeholder])
         (when retract-multiple-values?
-          [:db/retract (:db/id block) property-id])
+          [:db/retract (:db/id block') property-id])
         block-tx-data]))))
 
 (defn- get-property-value-schema