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

Merge pull request #766 from hennevogel/differentreality-fixes

Browse source 
Fixes for the last merge
This commit is contained in:
Henne Vogelsang 2016-02-08 13:34:55 +01:00
commit e28e1bf963
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/schedules_controller.rb
View file

@ -16,7 +16,11 @@ module Admin
return return
end end
@dates = @conference.start_date..@conference.end_date @dates = @conference.start_date..@conference.end_date
@rooms = @venue.rooms if @venue && @venue.rooms.any?
@rooms = @venue.rooms
else
@rooms = [ Room.new(name: 'No Rooms!', size: 0) ]
end
end end
def update def update

2
app/models/ability.rb
View file

@ -165,7 +165,7 @@ class Ability
can :manage, DifficultyLevel, program: { conference_id: conf_ids_for_cfp } can :manage, DifficultyLevel, program: { conference_id: conf_ids_for_cfp }
can :manage, EmailSettings, conference_id: conf_ids_for_cfp can :manage, EmailSettings, conference_id: conf_ids_for_cfp
can :manage, Room, venue: { conference_id: conf_ids_for_cfp } can :manage, Room, venue: { conference_id: conf_ids_for_cfp }
can :index, Venue, conference_id: conf_ids_for_cfp can :show, Venue, conference_id: conf_ids_for_cfp
can :manage, Cfp, program: { conference_id: conf_ids_for_cfp } can :manage, Cfp, program: { conference_id: conf_ids_for_cfp }
can :manage, Program, conference_id: conf_ids_for_cfp can :manage, Program, conference_id: conf_ids_for_cfp
can :manage, Commercial, commercialable_type: 'Event', can :manage, Commercial, commercialable_type: 'Event',