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

Merge pull request #24 from ancorgs/fix_f53af55a

Browse source 
Fixing a bug introduced in f53af55a74
This commit is contained in:
Ancor Gonzalez Sosa 2013-07-15 08:31:01 -07:00
commit 79b44f4eb1
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ class Admin::RegistrationsController < ApplicationController
people.email AS email") people.email AS email")
@attended = @conference.registrations.where("attended = ?", true) @attended = @conference.registrations.where("attended = ?", true)
@headers = %w[attended name email social_events attending_with_partner need_access other_needs arrival departure] @headers = %w[attended name email attending_social_events attending_with_partner need_access other_needs arrival departure]
end end
def change_field def change_field
@ -70,4 +70,4 @@ class Admin::RegistrationsController < ApplicationController
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 end
end end

3
app/models/registration.rb
View file

@ -17,7 +17,6 @@ class Registration < ActiveRecord::Base
accepts_nested_attributes_for :social_events accepts_nested_attributes_for :social_events
alias_attribute :with_partner, :attending_with_partner alias_attribute :with_partner, :attending_with_partner
alias_attribute :social_events, :attending_social_events
alias_attribute :need_access, :handicapped_access_required alias_attribute :need_access, :handicapped_access_required
alias_attribute :other_needs, :other_special_needs alias_attribute :other_needs, :other_special_needs
end end