From 8437cbe69c280529c2937e1a0fa275cdef8e6876 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 29 Apr 2008 11:37:37 +0000 Subject: [PATCH] Fixed: user removed from group when :group_id param is not submitted. git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1381 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- groups/app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groups/app/controllers/users_controller.rb b/groups/app/controllers/users_controller.rb index 9fb11be00..3cd66d6a4 100644 --- a/groups/app/controllers/users_controller.rb +++ b/groups/app/controllers/users_controller.rb @@ -80,7 +80,7 @@ class UsersController < ApplicationController @user.admin = params[:user][:admin] if params[:user][:admin] @user.login = params[:user][:login] if params[:user][:login] @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id - @user.group_id = params[:user][:group_id] + @user.group_id = params[:user][:group_id] if params[:user][:group_id] if params[:custom_fields] @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) } @user.custom_values = @custom_values