meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-04 16:13:22 +00:00
Code Issues Releases Wiki Activity

shorten long line of UsersController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20597 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-12-09 14:12:31 +00:00
parent be96bd726d
commit ee22339c61
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/users_controller.rb
View File

@ -101,15 +101,21 @@ class UsersController < ApplicationController
end
def new
@user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
@user = User.new(:language => Setting.default_language,
:mail_notification => Setting.default_notification_option)
@user.safe_attributes = params[:user]
@auth_sources = AuthSource.all
end
def create
@user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option, :admin => false)
@user = User.new(:language => Setting.default_language,
:mail_notification => Setting.default_notification_option,
:admin => false)
@user.safe_attributes = params[:user]
@user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
unless @user.auth_source_id
@user.password = params[:user][:password]
@user.password_confirmation = params[:user][:password_confirmation]
end
@user.pref.safe_attributes = params[:pref]
if @user.save
@ -117,7 +123,9 @@ class UsersController < ApplicationController
respond_to do |format|
format.html do
flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user)))
flash[:notice] =
l(:notice_user_successful_create,
:id => view_context.link_to(@user.login, user_path(@user)))
if params[:continue]
attrs = {:generate_password => @user.generate_password}
redirect_to new_user_path(:user => attrs)