merge master

lgessler · Mar 13, 2024 · ef08632 · ef08632
2 parents 9d3aeaa + 4006d3d
commit ef08632
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/glam/models/auth.clj b/src/main/glam/models/auth.clj
@@ -93,7 +93,7 @@
 (def user-required (make-auth-transform (partial level-authorized :user) "valid login required"))
 
 (defn ident-locked? [env ident]
-  (let [user-id (get-in env [:ring/request :session :user/id])]
+  (let [user-id (:user/id (get-session env))]
     (access/ident-locked? (:node env) user-id ident)))
 
 (defn lock-holder-name [{:keys [node]} ident]

diff --git a/src/main/glam/xtdb/span_layer.clj b/src/main/glam/xtdb/span_layer.clj
@@ -61,4 +61,5 @@
   (gxc/add-join** node span-layer-id :span-layer/relation-layers relation-layer-id))
 
 (gxe/deftx remove-relation-layer [node span-layer-id relation-layer-id]
-  (gxc/remove-join** node span-layer-id :span-layer/relation-layers relation-layer-id))
+  (gxc/remove-join** node span-layer-id :span-layer/relation-layers relation-layer-id))
+