From 66489f01eb3e93cec91e4a103f3daf5d4cf27027 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Feb 2025 11:33:56 -0600 Subject: [PATCH] Only display events visible to the current user --- app/helpers/events_helper.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 18c4e3546..d20c733fe 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -47,11 +47,15 @@ module EventsHelper start_time = day.beginning_of_day end_time = day.end_of_day + accessible_events = Event.joins(bubble: :bucket) + .merge(Current.user.buckets) + .where(created_at: start_time..end_time) + headers = { "Touched" => nil, "Discussed" => nil, - "Added" => Event.where(action: "published", created_at: start_time..end_time).count, - "Popped" => Event.where(action: "popped", created_at: start_time..end_time).joins(:creator).merge(User.without_system).count + "Added" => accessible_events.where(action: "published").count, + "Popped" => accessible_events.where(action: "popped").joins(:creator).merge(User.without_system).count } headers.map do |header, count|