comparison app/controllers/users_controller.rb @ 158:e71a969c151a feature_55

migration with new "institution_type" column in ssamr_user_details table.

radio buttons now rely on database

     @notification_option = @user.mail_notification
     
     @ssamr_user_details = @user.ssamr_user_detail
 
     @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i
-
-    if @institution_type == "other"
-      @selected_institution_id = 11
-    end
+    @institution_type = @ssamr_user_details.institution_type
     
     @auth_sources = AuthSource.find(:all)
     @membership ||= Member.new
   end
   

     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
+      @ssamr_user_details.other_institution = @user.ssamr_user_detail.other_institution
+      @ssamr_user_details.institution_type = @user.ssamr_user_detail.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.other_institution = params[:ssamr_user_details][:other_institution]
+      @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type]
       @ssamr_user_details.save!
     end
 
     if @user.save
       @user.pref.save