# HG changeset patch
# User luisf@figasmac.local
# Date 1291382052 0
# Node ID b5bd39e2765895430eac3934c752d5a6eb7fc8fe
# Parent  39db1b84d09f40ad05c6f8c043207c49ffc72574
Users status can now be changed (activated/locked)

diff -r 39db1b84d09f -r b5bd39e27658 app/controllers/users_controller.rb
--- a/app/controllers/users_controller.rb	Fri Dec 03 09:54:48 2010 +0000
+++ b/app/controllers/users_controller.rb	Fri Dec 03 13:14:12 2010 +0000
@@ -156,10 +156,13 @@
     @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
 
     @ssamr_user_details = @user.ssamr_user_detail
-    @ssamr_user_details.description = params[:ssamr_user_details][:description]
-    
-    @ssamr_user_details.save!
-    
+    if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty?
+      @ssamr_user_details.description = @user.ssamr_user_detail.description
+    else
+      @ssamr_user_details.description = params[:ssamr_user_details][:description]
+      @ssamr_user_details.save!
+    end
+
     if @user.save
       @user.pref.save
       @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])