From 7005de51c5b26a542ad7fa1bdbf8289b0c76027d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 30 Jan 2016 15:25:11 +0000
Subject: [PATCH] Additional option for USER_FORMAT, #{lastname}#{firstname}
 without any sperator (#3551).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@15133 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2a1818c6e..7e5da46c8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -47,20 +47,25 @@ class User < Principal
         :order => %w(lastname firstname id),
         :setting_order => 4
       },
+    :lastnamefirstname => {
+        :string => '#{lastname}#{firstname}',
+        :order => %w(lastname firstname id),
+        :setting_order => 5
+      },
     :lastname_comma_firstname => {
         :string => '#{lastname}, #{firstname}',
         :order => %w(lastname firstname id),
-        :setting_order => 5
+        :setting_order => 6
       },
     :lastname => {
         :string => '#{lastname}',
         :order => %w(lastname id),
-        :setting_order => 6
+        :setting_order => 7
       },
     :username => {
         :string => '#{login}',
         :order => %w(login id),
-        :setting_order => 7
+        :setting_order => 8
       },
   }