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

Merge pull request #1352 from BelieveC/ScheduleLogIn

Browse source 
Fixes #1343, Allow viewing public schedule without login
This commit is contained in:
Ana María Martínez Gómez 2017-03-31 15:58:26 +02:00 • committed by GitHub
commit 42741fa90b
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/schedules_controller.rb
View file

@ -1,7 +1,8 @@
class SchedulesController < ApplicationController class SchedulesController < ApplicationController
load_and_authorize_resource
protect_from_forgery with: :null_session protect_from_forgery with: :null_session
before_action :respond_to_options before_action :respond_to_options
load_and_authorize_resource :conference, find_by: :short_title load_resource :conference, find_by: :short_title
load_resource :program, through: :conference, singleton: true, except: :index load_resource :program, through: :conference, singleton: true, except: :index
def show def show

4
app/models/ability.rb
View file

@ -62,6 +62,10 @@ class Ability
can [:new, :create], Event do |event| can [:new, :create], Event do |event|
event.program.cfp_open? && event.new_record? event.program.cfp_open? && event.new_record?
end end
can [:show, :events], Schedule do |schedule|
schedule.program.schedule_public
end
end end
end end