From e98a16141ef6d1cfc0cfe7994511b3a9478e0366 Mon Sep 17 00:00:00 2001 From: hq1 Date: Tue, 4 Jul 2023 12:07:00 +0200 Subject: [PATCH] Enable superadmin access to funnel settings (#3104) --- lib/plausible_web/live/funnel_settings.ex | 8 +++++++- lib/plausible_web/live/funnel_settings/form.ex | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex index 695e34e09..9de1f4b4a 100644 --- a/lib/plausible_web/live/funnel_settings.ex +++ b/lib/plausible_web/live/funnel_settings.ex @@ -15,7 +15,13 @@ defmodule PlausibleWeb.Live.FunnelSettings do socket ) do true = Plausible.Funnels.enabled_for?("user:#{user_id}") - site = Sites.get_for_user!(user_id, domain, [:owner, :admin]) + + site = + if Plausible.Auth.is_super_admin?(user_id) do + Sites.get_by_domain(domain) + else + Sites.get_for_user!(user_id, domain, [:owner, :admin]) + end funnels = Funnels.list(site) goal_count = Goals.count(site) diff --git a/lib/plausible_web/live/funnel_settings/form.ex b/lib/plausible_web/live/funnel_settings/form.ex index dcb9b6f60..589a0b216 100644 --- a/lib/plausible_web/live/funnel_settings/form.ex +++ b/lib/plausible_web/live/funnel_settings/form.ex @@ -12,7 +12,12 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do alias Plausible.{Sites, Goals} def mount(_params, %{"current_user_id" => user_id, "domain" => domain}, socket) do - site = Sites.get_for_user!(user_id, domain, [:owner, :admin]) + site = + if Plausible.Auth.is_super_admin?(user_id) do + Sites.get_by_domain(domain) + else + Sites.get_for_user!(user_id, domain, [:owner, :admin]) + end # We'll have the options trimmed to only the data we care about, to keep # it minimal at the socket assigns, yet, we want to retain specific %Goal{}