gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-15 20:54:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adds dependent restricted association to some models

Browse source 
fix #348
This commit is contained in:
chrisbr 2014-12-18 13:38:40 +01:00
parent 87b1aba1e9
commit 799fd0c3a4
19 changed files with 65 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,8 +16,8 @@ module Admin
def create
@room = @conference.rooms.new(room_params)
if @room.save
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title),
notice: 'Room successfully created.')
flash[:notice] = 'Room successfully created.'
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
else
flash[:error] = "Creating Room failed: #{@room.errors.full_messages.join('. ')}."
render :new
@ -26,9 +26,8 @@ module Admin
def update
if @room.update_attributes(room_params)
redirect_to(admin_conference_rooms_path(
conference_id: @conference.short_title),
notice: 'Room successfully updated.')
flash[:notice] = 'Room successfully updated.'
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
else
flash[:error] = "Update Room failed: #{@room.errors.full_messages.join('. ')}."
render :edit
@ -37,12 +36,11 @@ module Admin
def destroy
if @room.destroy
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title),
notice: 'Room successfully deleted.')
flash[:notice] = 'Room successfully deleted.'
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
else
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title),
error: 'Destroying room failed! ' \
"#{@room.errors.full_messages.join('. ')}.")
flash[:error] = "Destroying room failed! #{@room.errors.full_messages.join('. ')}."
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
end
end