Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Disable searching by member/owner emails in sites and enterprise plan CRMs (temporary) (#4905)

Adrian Gruntkowski1f0b9e9cf30f
diff --git a/lib/plausible/billing/enterprise_plan_admin.ex b/lib/plausible/billing/enterprise_plan_admin.ex
index 5ca92b0113..6b4a8e2564 100644
--- a/lib/plausible/billing/enterprise_plan_admin.ex
+++ b/lib/plausible/billing/enterprise_plan_admin.ex
@@ -12,8 +12,7 @@ defmodule Plausible.Billing.EnterprisePlanAdmin do
def search_fields(_schema) do
[
- :paddle_plan_id,
- team: [owner: [:name, :email]]
+ :paddle_plan_id
]
end
diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.ex
index 2607778a31..dd8cb27e1c 100644
--- a/lib/plausible/site/admin.ex
+++ b/lib/plausible/site/admin.ex
@@ -9,15 +9,13 @@ defmodule Plausible.SiteAdmin do
def search_fields(_schema) do
[
- :domain,
- members: [:name, :email]
+ :domain
]
end
def custom_index_query(_conn, _schema, query) do
from(r in query,
inner_join: o in assoc(r, :owner),
- as: :owner,
preload: [owner: o, team: [team_memberships: :user]]
)
end
diff --git a/lib/plausible_web/controllers/admin_controller.ex b/lib/plausible_web/controllers/admin_controller.ex
index f122c20afa..a0d015fe71 100644
--- a/lib/plausible_web/controllers/admin_controller.ex
+++ b/lib/plausible_web/controllers/admin_controller.ex
@@ -69,6 +69,20 @@ defmodule PlausibleWeb.AdminController do
end
defp usage_and_limits_html(team, usage, limits, embed?) do
+ sites =
+ if team do
+ Plausible.Repo.preload(team, :sites).sites
+ else
+ []
+ end
+
+ sites_list =
+ Enum.map_join(sites, "\n", fn site ->
+ """
+ <li><a href="/crm/sites/site/#{site.id}">#{site.domain}</a></li>
+ """
+ end)
+
content = """
<ul>
<li>Team: <b>#{team && team.name}</b></li>
@@ -76,6 +90,13 @@ defmodule PlausibleWeb.AdminController do
<li>Team members: <b>#{usage.team_members}</b> / #{limits.team_members}</li>
<li>Features: #{features_usage(usage.features)}</li>
<li>Monthly pageviews: #{monthly_pageviews_usage(usage.monthly_pageviews, limits.monthly_pageviews)}</li>
+ <li>
+ Owned sites:
+
+ <ul>
+ #{sites_list}
+ </ul>
+ </li>
</ul>
"""