From deb249d2fdb569df3a96b26ed95b08dc1c4d9d81 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 29 Jul 2020 22:34:08 -0700 Subject: [PATCH] better fix for join event links --- app/helpers/events_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 82815a1c..a5846074 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -177,7 +177,8 @@ module EventsHelper return unless event.url.present? && current_user conference = event.conference - is_today = event.time&.today? + is_today = event.time&.in_time_zone(c.timezone).to_date == conference.current_conference_day + if current_user.roles.where(id: conference.roles).any? # Show Pre-Event links for any memeber of the conference team. link_to("Join Live Event #{'(Pre-Event)' unless is_today}",