dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: Openid registration form should not require user to enter password (#11331).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9929 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-07-07 06:22:35 +00:00
parent 6086aa1be4
commit 76a4b81cf3
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/account_controller.rb
+5 -2
View File
@@ -84,8 +84,9 @@ class AccountController < ApplicationController
session[:auth_source_registration] = nil
@user = User.new(:language => Setting.default_language)
else
user_params = params[:user] || {}
@user = User.new
@user.safe_attributes = params[:user]
@user.safe_attributes = user_params
@user.admin = false
@user.register
if session[:auth_source_registration]
@@ -100,7 +101,9 @@ class AccountController < ApplicationController
end
else
@user.login = params[:user][:login]
@user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
@user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
end
case Setting.self_registration
when '1'