comparison app/controllers/my_controller.rb @ 169:bc23796a7120 feature_55

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

     @user = User.current
     @pref = @user.pref
     @ssamr_user_details = @user.ssamr_user_detail
     
     @selected_institution_id = @ssamr_user_details.institution_id.to_i
-    logger.info "Mercedes"
-    
-    logger.info @selected_institution_id 
     
     if request.post?
       @user.attributes = params[:user]
       @user.mail_notification = params[:notification_option] || 'only_my_events'
       @user.pref.attributes = params[:pref]

         @ssamr_user_details = SsamrUserDetail.new()
         @user.ssamr_user_detail = @ssamr_user_details
       else
         @ssamr_user_details = @user.ssamr_user_detail
       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
         @institution_type = @ssamr_user_details.institution_type

       else
         @ssamr_user_details.description = params[:ssamr_user_details][:description]
         @ssamr_user_details.institution_id = params[:ssamr_user_details][:institution_id]
         @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type]
         @ssamr_user_details.other_institution = params[:ssamr_user_details][:other_institution]
-        @ssamr_user_details.save!
       end
 
       @selected_institution_id = @ssamr_user_details.institution_id.to_i
                   
       if @user.save