gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge efdb2cd63b into 4b6895f31d

Browse source
This commit is contained in:
Stella Rouzi 2026-06-27 18:17:28 +02:00 • committed by GitHub
commit e06a47820c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 118 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/schedules_controller.rb
View file

@ -3,6 +3,7 @@
class SchedulesController < ApplicationController
load_and_authorize_resource
before_action :respond_to_options
before_action :favourites
load_resource :conference, find_by: :short_title
load_resource :program, through: :conference, singleton: true, except: :index
before_action :load_withdrawn_event_schedules, only: [:show, :events]
@ -58,9 +59,17 @@ class SchedulesController < ApplicationController
@events_schedules = @program.selected_event_schedules(
includes: [:room, { event: %i[track event_type speakers submitter] }]
)
@events_schedules = [] unless @events_schedules
@unscheduled_events = @program.events.confirmed - @events_schedules.map(&:event)
@events_schedules = @events_schedules.select{ |e| e.event.favourite_users.exists?(current_user.id) } if @events_schedules && current_user && @favourites
@events_schedules = [] unless @events_schedules
@favourites = params[:favourites] == 'true'
@unscheduled_events = if @program.selected_schedule
@program.events.confirmed - @events_schedules.map(&:event)
else
@program.events.confirmed
end
@unscheduled_events = @unscheduled_events.select{ |e| e.favourite_users.exists?(current_user.id) } if current_user && @favourites
day = @conference.current_conference_day
@tag = day.strftime('%Y-%m-%d') if day
@ -72,6 +81,10 @@ class SchedulesController < ApplicationController
private
def favourites
@favourites = params[:favourites] == 'true'
end
def respond_to_options
respond_to do |format|
format.html { head :ok }