Browse Source

wtf?

development
Godwin 10 years ago
parent
commit
9dff32e6d3
  1. 4
      app/controllers/conferences_controller.rb
  2. 4
      app/views/conferences/_register_organizations.html.haml

4
app/controllers/conferences_controller.rb

@ -127,7 +127,7 @@ class ConferencesController < ApplicationController
case session[:registration_step] || params['step'] case session[:registration_step] || params['step']
when 'confirm' when 'confirm'
if session[:registration][:is_participant] if session[:registration][:is_participant]
registration = ConferenceRegistration.find(session[:registration][:registration_id]) @registration = ConferenceRegistration.find(session[:registration][:registration_id])
if registration.completed if registration.completed
complete_registration complete_registration
next_step = 'thanks' next_step = 'thanks'
@ -305,7 +305,7 @@ class ConferencesController < ApplicationController
session[:registration][:questions] = params[:questions].deep_symbolize_keys session[:registration][:questions] = params[:questions].deep_symbolize_keys
session[:registration][:is_workshop_host] = !params[:is_workshop_host].to_i.zero? session[:registration][:is_workshop_host] = !params[:is_workshop_host].to_i.zero?
next_step = 'organizations' next_step = 'organizations'
if params[:submit] || params[:next] if params[:cancel].blank?#params[:submit] || params[:next]
if !session[:registration][:organizations] if !session[:registration][:organizations]
user = User.find_by(:email => session[:registration][:email]) user = User.find_by(:email => session[:registration][:email])
session[:registration][:organizations] = Array.new session[:registration][:organizations] = Array.new

4
app/views/conferences/_register_organizations.html.haml

@ -1,5 +1,5 @@
- registration = ConferenceRegistration.find(session[:registration][:registration_id]) -# registration = ConferenceRegistration.find(session[:registration][:registration_id])
- if registration && registration.is_confirmed - if @registration && @registration.is_confirmed
%h3=_'register.organizations.confirm_thanks.title','Thanks for confirming!' %h3=_'register.organizations.confirm_thanks.title','Thanks for confirming!'
- if session[:registration][:is_workshop_host] - if session[:registration][:is_workshop_host]
%p=_'register.organizations.confirm_thanks.is_workshop_host.help','Before you finish, we would just like to find out where you\'re coming from and get some info about your workshop.' %p=_'register.organizations.confirm_thanks.is_workshop_host.help','Before you finish, we would just like to find out where you\'re coming from and get some info about your workshop.'

Loading…
Cancel
Save