diff app/controllers/users_controller.rb @ 169:bc23796a7120 feature_55

ssamr validation on my/account is now done correctly
other small bug fixes.

--- a/app/controllers/users_controller.rb	Mon Jan 31 20:59:31 2011 +0000
+++ b/app/controllers/users_controller.rb	Tue Feb 01 17:50:01 2011 +0000
@@ -91,11 +91,6 @@
     @auth_sources = AuthSource.find(:all)
 
     @ssamr_user_details = SsamrUserDetail.new
-
-    # default value
-    @selected_institution_id = 1
-
-    
   end
   
   verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
@@ -145,14 +140,7 @@
     
     @ssamr_user_details = @user.ssamr_user_detail
     
-    if @ssamr_user_details.institution_type.blank?
-      @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i
-      @institution_type = @ssamr_user_details.institution_type
-    else
-      @selected_institution_id = false
-      @institution_type = true
-    end
-    
+    @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i    
     
     @auth_sources = AuthSource.find(:all)
     @membership ||= Member.new