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

houndci fixes

Browse source
This commit is contained in:
Stella Rouzi 2014-05-15 20:55:27 +03:00
parent 7490316a5b
commit 544146e7a9
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/admin/registrations_controller.rb
View file

@ -19,7 +19,8 @@ class Admin::RegistrationsController < ApplicationController
end
redirect_to admin_conference_registrations_path(@conference.short_title)
flash[:notice] = "Updated '#{params[:view_field]}' => #{@registration.attended} for #{(Person.where("id = ?", @registration.person_id).first).email}"
flash[:notice] = "Updated '#{params[:view_field]}' => #{@registration.attended} for
#{(Person.where("id = ?", @registration.person_id).first).email}"
end
def edit
@ -42,7 +43,8 @@ class Admin::RegistrationsController < ApplicationController
redirect_to(admin_conference_registrations_path(@conference.short_title))
rescue Exception => e
Rails.logger.debug e.backtrace.join("\n")
redirect_to(admin_conference_registrations_path(@conference.short_title), :alert => 'Failed to update registration:' + e.message)
redirect_to(admin_conference_registrations_path(@conference.short_title),
:alert => 'Failed to update registration:' + e.message)
return
end
end
@ -120,11 +122,13 @@ class Admin::RegistrationsController < ApplicationController
flash[:notice] = "Deleted registration for #{person.public_name} #{person.email}"
rescue Exception => e
Rails.logger.debug e.backtrace.join("\n")
redirect_to(admin_conference_registrations_path(@conference.short_title), :alert => 'Failed to delete registration:' + e.message)
redirect_to(admin_conference_registrations_path(@conference.short_title),
:alert => 'Failed to delete registration:' + e.message)
return
end
else
redirect_to(admin_conference_registrations_path(@conference.short_title), :alert => 'You must be an admin to delete a registration.')
redirect_to(admin_conference_registrations_path(@conference.short_title),
:alert => 'You must be an admin to delete a registration.')
end
end
end