diff app/controllers/my_controller.rb @ 188:f9fe5ef6156e feature_55

fixed bugs with validation of forms.

--- a/app/controllers/my_controller.rb	Thu Feb 03 15:31:33 2011 +0000
+++ b/app/controllers/my_controller.rb	Thu Feb 03 15:54:00 2011 +0000
@@ -54,6 +54,13 @@
     @pref = @user.pref
     @ssamr_user_details = @user.ssamr_user_detail
     
+    
+    if @user.ssamr_user_detail == nil
+       @selected_institution_id = nil
+     else
+       @selected_institution_id = @ssamr_user_details.institution_id.to_i
+     end    
+    
     if request.post?
       @user.attributes = params[:user]
       @user.mail_notification = params[:notification_option] || 'only_my_events'
@@ -63,13 +70,10 @@
       if @user.ssamr_user_detail == nil
         @ssamr_user_details = SsamrUserDetail.new()
         @user.ssamr_user_detail = @ssamr_user_details
-        @selected_institution_id = NULL
       else
         @ssamr_user_details = @user.ssamr_user_detail
-        @selected_institution_id = @ssamr_user_details.institution_id.to_i
       end
 
-
       if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty?
         @ssamr_user_details.description = @user.ssamr_user_detail.description
         @ssamr_user_details.institution_id = @user.ssamr_user_detail.institution_id
@@ -81,8 +85,6 @@
         @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type]
         @ssamr_user_details.other_institution = params[:ssamr_user_details][:other_institution]
       end
-
-      @selected_institution_id = @ssamr_user_details.institution_id.to_i
                   
       if @user.save
         @user.pref.save