diff options
| -rw-r--r-- | app/models/user.rb | 15 | ||||
| -rw-r--r-- | test/unit/user_test.rb | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 87db4eb5a..6702b7e58 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -33,30 +33,35 @@ class User < Principal :order => %w(firstname lastname id), :setting_order => 1 }, + :firstname_lastinitial => { + :string => '#{firstname} #{lastname.to_s.chars.first}.', + :order => %w(firstname lastname id), + :setting_order => 2 + }, :firstname => { :string => '#{firstname}', :order => %w(firstname id), - :setting_order => 2 + :setting_order => 3 }, :lastname_firstname => { :string => '#{lastname} #{firstname}', :order => %w(lastname firstname id), - :setting_order => 3 + :setting_order => 4 }, :lastname_coma_firstname => { :string => '#{lastname}, #{firstname}', :order => %w(lastname firstname id), - :setting_order => 4 + :setting_order => 5 }, :lastname => { :string => '#{lastname}', :order => %w(lastname id), - :setting_order => 5 + :setting_order => 6 }, :username => { :string => '#{login}', :order => %w(login id), - :setting_order => 6 + :setting_order => 7 }, } diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 88b254171..eff9a61ff 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -410,6 +410,7 @@ class UserTest < ActiveSupport::TestCase end def test_name_format + assert_equal 'John S.', @jsmith.name(:firstname_lastinitial) assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname) with_settings :user_format => :firstname_lastname do assert_equal 'John Smith', @jsmith.reload.name |