This commit is contained in:
Godwin 2014-07-28 13:12:06 -06:00
parent 039995ab26
commit 693f39219d

View File

@ -221,7 +221,7 @@ class ConferencesController < ApplicationController
error = _'registration.register.no_organization_error',"Please select an organization or enter a new one" error = _'registration.register.no_organization_error',"Please select an organization or enter a new one"
end end
when 'new_organization' when 'new_organization'
if params[:name].blank? if params[:organization_name].blank?
error = _'register.new_organization.no_name_error',"Please tell us your organization's name" error = _'register.new_organization.no_name_error',"Please tell us your organization's name"
end end
if params[:organization_email].blank? if params[:organization_email].blank?
@ -229,10 +229,10 @@ class ConferencesController < ApplicationController
elsif params[:organization_email].strip.casecmp(session[:registration][:email].strip) elsif params[:organization_email].strip.casecmp(session[:registration][:email].strip)
error ||= _'register.new_organization.same_email_as_attendee_error',"This email needs to be different than your own personal email, we need to keep in touch with your organization even if you're gone in years to come." error ||= _'register.new_organization.same_email_as_attendee_error',"This email needs to be different than your own personal email, we need to keep in touch with your organization even if you're gone in years to come."
end end
if params[:street].blank? if params[:organization_street].blank?
error ||= _'register.new_organization.no_street_error','Please enter your organization\'s street address' error ||= _'register.new_organization.no_street_error','Please enter your organization\'s street address'
end end
if params[:city].blank? if params[:organization_city].blank?
error ||= _'register.new_organization.no_city_error','Please enter your organization\'s city' error ||= _'register.new_organization.no_city_error','Please enter your organization\'s city'
end end
i = params[:new_org_index].to_i i = params[:new_org_index].to_i