From e1630fd848587068f910c60debd3d8589657701d Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Tue, 9 Oct 2018 19:31:04 +0200 Subject: [PATCH] remove name collisions --- src/wanijo/instance/routes.clj | 4 ++-- src/wanijo/schema/domain.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wanijo/instance/routes.clj b/src/wanijo/instance/routes.clj index cca174a..415d16b 100644 --- a/src/wanijo/instance/routes.clj +++ b/src/wanijo/instance/routes.clj @@ -8,8 +8,8 @@ [wanijo.schema.domain :as domain-schema] [wanijo.attribute.domain :as domain-attr])) -(defn attr-type->widget [type] - (case type +(defn attr-type->widget [attr-type] + (case attr-type ("markdown" "text") :textarea :input)) diff --git a/src/wanijo/schema/domain.clj b/src/wanijo/schema/domain.clj index 9339a4f..1e6022e 100644 --- a/src/wanijo/schema/domain.clj +++ b/src/wanijo/schema/domain.clj @@ -96,11 +96,11 @@ -[:permission {type:{type}}]- (s)) AS is_public") -(defn has-user-permission? [type schema-uuid user-uuid] +(defn has-user-permission? [perm-type schema-uuid user-uuid] (let [permissions (first (neo4j/exec-query! schema-permissions {:schema_uuid schema-uuid :user_uuid user-uuid - :type type})) + :type perm-type})) public? (neo4j/bool (:is_public permissions)) user? (neo4j/bool (:user_has_permission permissions))] (or public? user?)))