From 72f3b9a826d09e58e02ba6e8159a4fbab96f4d8c Mon Sep 17 00:00:00 2001
From: Cam Saul <cammsaul@gmail.com>
Date: Fri, 5 Apr 2019 19:38:06 -0700
Subject: [PATCH] Code deduplication & indentation fixes :wrench:
---
src/metabase/api/dashboard.clj | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/metabase/api/dashboard.clj b/src/metabase/api/dashboard.clj
index bb6f2b99d1c..ff60886538d 100644
--- a/src/metabase/api/dashboard.clj
+++ b/src/metabase/api/dashboard.clj
@@ -217,14 +217,14 @@
:collection_id collection_id
:collection_position collection_position}
dashboard (db/transaction
- ;; Adding a new dashboard at `collection_position` could cause other dashboards in this collection to change
- ;; position, check that and fix up if needed
- (api/maybe-reconcile-collection-position! dashboard-data)
- ;; Ok, now save the Dashboard
- (u/prog1 (db/insert! Dashboard dashboard-data)
- ;; Get cards from existing dashboard and associate to copied dashboard
- (doseq [card (:ordered_cards existing-dashboard)]
- (api/check-500 (dashboard/add-dashcard! <> (:card_id card) card)))))]
+ ;; Adding a new dashboard at `collection_position` could cause other dashboards in this
+ ;; collection to change position, check that and fix up if needed
+ (api/maybe-reconcile-collection-position! dashboard-data)
+ ;; Ok, now save the Dashboard
+ (u/prog1 (db/insert! Dashboard dashboard-data)
+ ;; Get cards from existing dashboard and associate to copied dashboard
+ (doseq [card (:ordered_cards existing-dashboard)]
+ (api/check-500 (dashboard/add-dashcard! <> (:card_id card) card)))))]
(events/publish-event! :dashboard-create dashboard)))
@@ -233,13 +233,7 @@
(api/defendpoint GET "/:id"
"Get `Dashboard` with ID."
[id]
- (u/prog1 (-> (Dashboard id)
- api/check-404
- (hydrate [:ordered_cards :card :series] :can_write)
- api/read-check
- api/check-not-archived
- hide-unreadable-cards
- add-query-average-durations)
+ (u/prog1 (get-dashboard id)
(events/publish-event! :dashboard-read (assoc <> :actor_id api/*current-user-id*))))
--
GitLab