diff 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
line wrap: on
line diff
--- a/app/controllers/account_controller.rb	Thu Feb 03 15:55:45 2011 +0000
+++ b/app/controllers/account_controller.rb	Mon Feb 07 13:16:36 2011 +0000
@@ -108,7 +108,9 @@
 
         # associates the 2 objects
         @user.ssamr_user_detail = @ssamr_user_details
+        @selected_institution_id = params[:ssamr_user_details][:institution_id].to_i
 
+        
         case Setting.self_registration
         when '1'
           register_by_email_activation(@user)