From 472889083d1ed88884fc298dc04359b27bf78753 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 26 Nov 2020 10:19:26 +0200 Subject: [PATCH] Order sites alphabetically --- lib/plausible_web/controllers/site_controller.ex | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index d9c10af62..37474a3a4 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -6,9 +6,16 @@ defmodule PlausibleWeb.SiteController do plug PlausibleWeb.RequireAccountPlug def index(conn, _params) do - user = conn.assigns[:current_user] |> Repo.preload(:sites) - visitors = Plausible.Stats.Clickhouse.last_24h_visitors(user.sites) - render(conn, "index.html", sites: user.sites, visitors: visitors) + user = conn.assigns[:current_user] + sites = Repo.all( + from s in Plausible.Site, + join: sm in Plausible.Site.Membership, on: sm.site_id == s.id, + where: sm.user_id == ^user.id, + order_by: s.domain + ) + + visitors = Plausible.Stats.Clickhouse.last_24h_visitors(sites) + render(conn, "index.html", sites: sites, visitors: visitors) end def new(conn, _params) do