From c30cda9ba202ce3b8a9769f6869de23deb61ecfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cam=20Sau=CC=88l?= <cammsaul@gmail.com> Date: Tue, 7 Jul 2015 05:27:22 -0700 Subject: [PATCH] cleanup --- src/metabase/api/common.clj | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.clj index e929d275a87..8edb69b6bd6 100644 --- a/src/metabase/api/common.clj +++ b/src/metabase/api/common.clj @@ -415,21 +415,19 @@ "Check whether we can read an existing OBJ, or ENTITY with ID." ([obj] (check-404 obj) - (check-403 (if (satisfies? models/ICanReadWrite obj) (models/can-read? obj) - @(:can_read obj))) + (check-403 (models/can-read? obj)) obj) ([entity id] {:pre [(models/metabase-entity? entity) (integer? id)]} - (if (satisfies? models/ICanReadWrite entity) (models/can-read? entity id) + (if (satisfies? models/ICanReadWrite entity) (read-check (entity id))))) (defn write-check "Check whether we can write an existing OBJ, or ENTITY with ID." ([obj] (check-404 obj) - (check-403 (if (satisfies? models/ICanReadWrite obj) (models/can-write? obj) - @(:can_write obj))) + (check-403 (models/can-write? obj)) obj) ([entity id] {:pre [(models/metabase-entity? entity) -- GitLab