gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GDI...typo.

Browse source
This commit is contained in:
Michael Ball 2020-07-29 22:42:45 -07:00
parent deb249d2fd
commit 32ef4a294b
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/events_helper.rb
View file

@ -177,7 +177,8 @@ module EventsHelper
return unless event.url.present? && current_user return unless event.url.present? && current_user
conference = event.conference conference = event.conference
is_today = event.time&.in_time_zone(c.timezone).to_date == conference.current_conference_day is_today = event.time&.in_time_zone(conference.timezone).to_date
== conference.current_conference_day
if current_user.roles.where(id: conference.roles).any? if current_user.roles.where(id: conference.roles).any?
# Show Pre-Event links for any memeber of the conference team. # Show Pre-Event links for any memeber of the conference team.

9
app/models/event_schedule.rb
View file

@ -27,6 +27,15 @@ class EventSchedule < ApplicationRecord
delegate :guid, to: :room, prefix: true delegate :guid, to: :room, prefix: true
delegate :timezone, to: event
##
# True within 1 hour before and after the event.
#
def happening_now?(threshold=1.hour)
false
end
def self.withdrawn_or_canceled_event_schedules(schedule_ids) def self.withdrawn_or_canceled_event_schedules(schedule_ids)
EventSchedule EventSchedule
.unscoped .unscoped