Skip to content
Snippets Groups Projects
Unverified Commit 3e45686a authored by Cam Saul's avatar Cam Saul
Browse files

Don't add in_public_dashboard status to (empty) Cards of text-only DashCards

parent 8b257f26
Branches
Tags
No related merge requests found
......@@ -64,7 +64,8 @@
(map :id)
set))]
(for [card cards]
(assoc card :in_public_dashboard (contains? public-dashboard-card-ids (u/get-id card))))))
(when (some? card) ; card may be `nil` here if it comes from a text-only Dashcard
(assoc card :in_public_dashboard (contains? public-dashboard-card-ids (u/get-id card)))))))
;;; ---------------------------------------------- Permissions Checking ----------------------------------------------
......
......@@ -36,7 +36,9 @@
(some? public-uuid))
;; if Dashboard is already hydrated no need to do it a second time
(let [cards (or (dashcards->cards (:ordered_cards dashboard))
(dashcards->cards (-> (db/select [DashboardCard :id :card_id], :dashboard_id (u/get-id dashboard))
(dashcards->cards (-> (db/select [DashboardCard :id :card_id]
:dashboard_id (u/get-id dashboard)
:card_id [:not= nil]) ; skip text-only Cards
(hydrate [:card :in_public_dashboard] :series))))]
(or (empty? cards)
(some i/can-read? cards)))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment