From b9cd54a2568bf1d31d56e6f243a7e7922755f414 Mon Sep 17 00:00:00 2001 From: Ancor Gonzalez Sosa Date: Mon, 15 Jul 2013 16:07:23 +0200 Subject: [PATCH] Fixing a bug introduced in f53af55a741830718967a2928d0d36b5b557baa6 --- app/controllers/admin/registrations_controller.rb | 4 ++-- app/models/registration.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/registrations_controller.rb b/app/controllers/admin/registrations_controller.rb index 3a5fd03c..edb5b5da 100644 --- a/app/controllers/admin/registrations_controller.rb +++ b/app/controllers/admin/registrations_controller.rb @@ -13,7 +13,7 @@ class Admin::RegistrationsController < ApplicationController people.email AS email") @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 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.') end end -end \ No newline at end of file +end diff --git a/app/models/registration.rb b/app/models/registration.rb index 3c65d6c8..7109e37e 100644 --- a/app/models/registration.rb +++ b/app/models/registration.rb @@ -17,7 +17,6 @@ class Registration < ActiveRecord::Base accepts_nested_attributes_for :social_events alias_attribute :with_partner, :attending_with_partner - alias_attribute :social_events, :attending_social_events alias_attribute :need_access, :handicapped_access_required alias_attribute :other_needs, :other_special_needs -end \ No newline at end of file +end