bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Added workshop request list to workshops page

Browse Source
This commit is contained in:
Godwin 2016-07-18 15:00:18 -07:00 committed by GitHub
parent b1a2de6cdf
commit e4c68d1448
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/conferences_controller.rb
View File

@ -722,13 +722,16 @@ class ConferencesController < ApplicationController
# initalize our arrays # initalize our arrays
@my_workshops = Array.new @my_workshops = Array.new
@requested_workshops = Array.new
@workshops_in_need = Array.new @workshops_in_need = Array.new
@workshops = Array.new @workshops = Array.new
# put wach workshop into the correct array # put wach workshop into the correct array
Workshop.where(conference_id: @this_conference.id).each do | workshop | Workshop.where(conference_id: @this_conference.id).each do | workshop |
if workshop.creator?(current_user) || workshop.collaborator?(current_user) if workshop.active_facilitator?(current_user)
@my_workshops << workshop @my_workshops << workshop
elsif workshop.requested_collaborator?(current_user)
@requested_workshops << workshop
elsif workshop.needs_facilitators elsif workshop.needs_facilitators
@workshops_in_need << workshop @workshops_in_need << workshop
else else
@ -738,6 +741,7 @@ class ConferencesController < ApplicationController
# sort the arrays by name # sort the arrays by name
@my_workshops.sort! { |a, b| a.title.downcase <=> b.title.downcase } @my_workshops.sort! { |a, b| a.title.downcase <=> b.title.downcase }
@requested_workshops.sort! { |a, b| a.title.downcase <=> b.title.downcase }
@workshops_in_need.sort! { |a, b| a.title.downcase <=> b.title.downcase } @workshops_in_need.sort! { |a, b| a.title.downcase <=> b.title.downcase }
@workshops.sort! { |a, b| a.title.downcase <=> b.title.downcase } @workshops.sort! { |a, b| a.title.downcase <=> b.title.downcase }
when :contact_info when :contact_info