bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

wtf?

Browse Source
This commit is contained in:
Godwin 2014-07-28 13:23:23 -06:00
parent 8194e05d9c
commit 9dff32e6d3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/conferences_controller.rb
View File

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

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

@ -1,5 +1,5 @@
- registration = ConferenceRegistration.find(session[:registration][:registration_id])
- if registration && registration.is_confirmed
-# registration = ConferenceRegistration.find(session[:registration][:registration_id])
- if @registration && @registration.is_confirmed
%h3=_'register.organizations.confirm_thanks.title','Thanks for confirming!'
- 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.'