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

Rooms belong to venue

Browse source
This commit is contained in:
Stella Rouzi 2015-11-07 11:43:36 +02:00 • committed by Henne Vogelsang
parent feabbfbc99
commit f840f2b3f0
31 changed files with 221 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/admin/rooms_controller.rb
View file

@ -1,22 +1,22 @@
module Admin
class RoomsController < Admin::BaseController
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource :program, through: :conference, singleton: true
load_and_authorize_resource through: :program
load_and_authorize_resource :venue, through: :conference, singleton: true
load_and_authorize_resource through: :venue
def index; end
def edit; end
def new
@room = @program.rooms.new
@room = @venue.rooms.new
end
def create
@room = @program.rooms.new(room_params)
@room = @venue.rooms.new(room_params)
if @room.save
flash[:notice] = 'Room successfully created.'
redirect_to(admin_conference_program_rooms_path(conference_id: @conference.short_title))
redirect_to(admin_conference_venue_rooms_path(conference_id: @conference.short_title))
else
flash[:error] = "Creating Room failed: #{@room.errors.full_messages.join('. ')}."
render :new
@ -26,7 +26,7 @@ module Admin
def update
if @room.update_attributes(room_params)
flash[:notice] = 'Room successfully updated.'
redirect_to(admin_conference_program_rooms_path(conference_id: @conference.short_title))
redirect_to(admin_conference_venue_rooms_path(conference_id: @conference.short_title))
else
flash[:error] = "Update Room failed: #{@room.errors.full_messages.join('. ')}."
render :edit
@ -36,10 +36,10 @@ module Admin
def destroy
if @room.destroy
flash[:notice] = 'Room successfully deleted.'
redirect_to(admin_conference_program_rooms_path(conference_id: @conference.short_title))
redirect_to(admin_conference_venue_rooms_path(conference_id: @conference.short_title))
else
flash[:error] = "Destroying room failed! #{@room.errors.full_messages.join('. ')}."
redirect_to(admin_conference_program_rooms_path(conference_id: @conference.short_title))
redirect_to(admin_conference_venue_rooms_path(conference_id: @conference.short_title))
end
end

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

@ -4,6 +4,7 @@ module Admin
# the schedule of a conference, which should not be accessed in the first place
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource :program, through: :conference, singleton: true
load_resource :venue, through: :conference, singleton: true
skip_before_filter :verify_authenticity_token, only: [:update]
layout 'schedule'
@ -15,7 +16,7 @@ module Admin
return
end
@dates = @conference.start_date..@conference.end_date
@rooms = @program.rooms
@rooms = @venue.rooms
end
def update