gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-18 22:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hound fixes

Browse source
This commit is contained in:
Stella Rouzi 2014-06-26 15:43:24 +03:00
parent e8990bfb12
commit fc753282d3
14 changed files with 180 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,8 @@ module Admin
def index
session[:return_to] ||= request.referer
@pdf_filename = "#{@conference.title}.pdf"
@registrations = @conference.registrations.includes(:user).order('registrations.created_at ASC')
@registrations = @conference.registrations.includes(:user)
@registrations = @registrations.order('registrations.created_at ASC')
@attended = @conference.registrations.where('attended = ?', true).count
@headers = %w(name email nickname other_needs arrival departure attended)
end
@ -36,7 +37,8 @@ module Admin
@user.update_attributes!(params[:registration][:user_attributes])
params[:registration].delete :user_attributes
if params[:registration][:supporter_registration]
@registration.supporter_registration.update_attributes(params[:registration][:supporter_registration_attributes])
@registration.supporter_registration.
update_attributes(params[:registration][:supporter_registration_attributes])
params[:registration].delete :supporter_registration_attributes
end
@registration.update_attributes!(params[:registration])