diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-06 01:02:52 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-06 01:02:52 +0000 |
| commit | 9da4ee5fcce2d20e125acc64377564a2797d1cbb (patch) | |
| tree | b6f93e814686df2a84e202402b873485f27d3862 /app/controllers/users_controller.rb | |
| parent | 270b559d362a39a8a9594f5fe6a10804e4653af1 (diff) | |
| download | redmine-9da4ee5fcce2d20e125acc64377564a2797d1cbb.tar.gz redmine-9da4ee5fcce2d20e125acc64377564a2797d1cbb.zip | |
Allow user password changes when changing to Internal authentication. #6267
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4066 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0354d165d..b854850a3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -95,7 +95,9 @@ class UsersController < ApplicationController if request.post? @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 + if params[:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?) + @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] + end @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids] @user.attributes = params[:user] # Was the account actived ? (do it before User#save clears the change) |