##// END OF EJS Templates
New user name format: firstname + first letter of lastname (#12085)....
Jean-Philippe Lang -
r10548:399223daba6f
parent child
Show More
@@ -33,30 +33,35 class User < Principal
33 :order => %w(firstname lastname id),
33 :order => %w(firstname lastname id),
34 :setting_order => 1
34 :setting_order => 1
35 },
35 },
36 :firstname_lastinitial => {
37 :string => '#{firstname} #{lastname.to_s.chars.first}.',
38 :order => %w(firstname lastname id),
39 :setting_order => 2
40 },
36 :firstname => {
41 :firstname => {
37 :string => '#{firstname}',
42 :string => '#{firstname}',
38 :order => %w(firstname id),
43 :order => %w(firstname id),
39 :setting_order => 2
44 :setting_order => 3
40 },
45 },
41 :lastname_firstname => {
46 :lastname_firstname => {
42 :string => '#{lastname} #{firstname}',
47 :string => '#{lastname} #{firstname}',
43 :order => %w(lastname firstname id),
48 :order => %w(lastname firstname id),
44 :setting_order => 3
49 :setting_order => 4
45 },
50 },
46 :lastname_coma_firstname => {
51 :lastname_coma_firstname => {
47 :string => '#{lastname}, #{firstname}',
52 :string => '#{lastname}, #{firstname}',
48 :order => %w(lastname firstname id),
53 :order => %w(lastname firstname id),
49 :setting_order => 4
54 :setting_order => 5
50 },
55 },
51 :lastname => {
56 :lastname => {
52 :string => '#{lastname}',
57 :string => '#{lastname}',
53 :order => %w(lastname id),
58 :order => %w(lastname id),
54 :setting_order => 5
59 :setting_order => 6
55 },
60 },
56 :username => {
61 :username => {
57 :string => '#{login}',
62 :string => '#{login}',
58 :order => %w(login id),
63 :order => %w(login id),
59 :setting_order => 6
64 :setting_order => 7
60 },
65 },
61 }
66 }
62
67
@@ -410,6 +410,7 class UserTest < ActiveSupport::TestCase
410 end
410 end
411
411
412 def test_name_format
412 def test_name_format
413 assert_equal 'John S.', @jsmith.name(:firstname_lastinitial)
413 assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname)
414 assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname)
414 with_settings :user_format => :firstname_lastname do
415 with_settings :user_format => :firstname_lastname do
415 assert_equal 'John Smith', @jsmith.reload.name
416 assert_equal 'John Smith', @jsmith.reload.name
General Comments 0
You need to be logged in to leave comments. Login now