Mercurial > hg > soundsoftware-site
comparison app/controllers/account_controller.rb @ 194:c56dcdfe6722 cannam-pre-20110113-merge
Merge from branch "feature_64"
author | Chris Cannam |
---|---|
date | Mon, 07 Feb 2011 13:16:36 +0000 |
parents | d1713ab10813 |
children | 73ff0e6a11b1 |
comparison
equal
deleted
inserted
replaced
189:b55279e641b8 | 194:c56dcdfe6722 |
---|---|
106 | 106 |
107 @ssamr_user_details = SsamrUserDetail.new(params[:ssamr_user_details]) | 107 @ssamr_user_details = SsamrUserDetail.new(params[:ssamr_user_details]) |
108 | 108 |
109 # associates the 2 objects | 109 # associates the 2 objects |
110 @user.ssamr_user_detail = @ssamr_user_details | 110 @user.ssamr_user_detail = @ssamr_user_details |
111 | 111 @selected_institution_id = params[:ssamr_user_details][:institution_id].to_i |
112 | |
113 | |
112 case Setting.self_registration | 114 case Setting.self_registration |
113 when '1' | 115 when '1' |
114 register_by_email_activation(@user) | 116 register_by_email_activation(@user) |
115 when '3' | 117 when '3' |
116 register_automatically(@user) | 118 register_automatically(@user) |