From 8e324ac1aff29abd05668401144a50eea7bfa57e Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Sat, 6 Feb 2016 18:15:11 +0100 Subject: [PATCH 1/2] Fix showing a schedule without venue/rooms --- app/controllers/admin/schedules_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/schedules_controller.rb b/app/controllers/admin/schedules_controller.rb index 21c5ab9e..bbbddbb1 100644 --- a/app/controllers/admin/schedules_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -16,7 +16,11 @@ module Admin return end @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 def update From 6fa38647714a8fac1da4b97ed1ac65d5ef491887 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 8 Feb 2016 12:50:58 +0100 Subject: [PATCH 2/2] Fix CFP ability --- app/models/ability.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 3c3e0ead..58cbed92 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -165,7 +165,7 @@ class Ability can :manage, DifficultyLevel, program: { 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 :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, Program, conference_id: conf_ids_for_cfp can :manage, Commercial, commercialable_type: 'Event',