From ee22339c61989802d89903bf55302841a3231340 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 9 Dec 2020 14:12:31 +0000 Subject: [PATCH] shorten long line of UsersController git-svn-id: http://svn.redmine.org/redmine/trunk@20597 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/users_controller.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9ff242709..4368a9f1a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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)