@@ -33,30 +33,35 class User < Principal | |||
|
33 | 33 | :order => %w(firstname lastname id), |
|
34 | 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 | 41 | :firstname => { |
|
37 | 42 | :string => '#{firstname}', |
|
38 | 43 | :order => %w(firstname id), |
|
39 |
:setting_order => |
|
|
44 | :setting_order => 3 | |
|
40 | 45 | }, |
|
41 | 46 | :lastname_firstname => { |
|
42 | 47 | :string => '#{lastname} #{firstname}', |
|
43 | 48 | :order => %w(lastname firstname id), |
|
44 |
:setting_order => |
|
|
49 | :setting_order => 4 | |
|
45 | 50 | }, |
|
46 | 51 | :lastname_coma_firstname => { |
|
47 | 52 | :string => '#{lastname}, #{firstname}', |
|
48 | 53 | :order => %w(lastname firstname id), |
|
49 |
:setting_order => |
|
|
54 | :setting_order => 5 | |
|
50 | 55 | }, |
|
51 | 56 | :lastname => { |
|
52 | 57 | :string => '#{lastname}', |
|
53 | 58 | :order => %w(lastname id), |
|
54 |
:setting_order => |
|
|
59 | :setting_order => 6 | |
|
55 | 60 | }, |
|
56 | 61 | :username => { |
|
57 | 62 | :string => '#{login}', |
|
58 | 63 | :order => %w(login id), |
|
59 |
:setting_order => |
|
|
64 | :setting_order => 7 | |
|
60 | 65 | }, |
|
61 | 66 | } |
|
62 | 67 |
@@ -410,6 +410,7 class UserTest < ActiveSupport::TestCase | |||
|
410 | 410 | end |
|
411 | 411 | |
|
412 | 412 | def test_name_format |
|
413 | assert_equal 'John S.', @jsmith.name(:firstname_lastinitial) | |
|
413 | 414 | assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname) |
|
414 | 415 | with_settings :user_format => :firstname_lastname do |
|
415 | 416 | assert_equal 'John Smith', @jsmith.reload.name |
General Comments 0
You need to be logged in to leave comments.
Login now