diff --git a/app/models/user.rb b/app/models/user.rb index 9a7c8cc71..8be16b823 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -25,50 +25,50 @@ class User < Principal # Different ways of displaying/sorting users USER_FORMATS = { :firstname_lastname => { - :string => '#{firstname} #{lastname}', - :order => %w(firstname lastname id), - :setting_order => 1 - }, + :string => '#{firstname} #{lastname}', + :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 - }, + :string => '#{firstname} #{lastname.to_s.chars.first}.', + :order => %w(firstname lastname id), + :setting_order => 2 + }, :firstinitial_lastname => { - :string => '#{firstname.to_s.gsub(/(([[:alpha:]])[[:alpha:]]*\.?)/, \'\2.\')} #{lastname}', - :order => %w(firstname lastname id), - :setting_order => 2 - }, + :string => '#{firstname.to_s.gsub(/(([[:alpha:]])[[:alpha:]]*\.?)/, \'\2.\')} #{lastname}', + :order => %w(firstname lastname id), + :setting_order => 2 + }, :firstname => { - :string => '#{firstname}', - :order => %w(firstname id), - :setting_order => 3 - }, + :string => '#{firstname}', + :order => %w(firstname id), + :setting_order => 3 + }, :lastname_firstname => { - :string => '#{lastname} #{firstname}', - :order => %w(lastname firstname id), - :setting_order => 4 - }, + :string => '#{lastname} #{firstname}', + :order => %w(lastname firstname id), + :setting_order => 4 + }, :lastnamefirstname => { - :string => '#{lastname}#{firstname}', - :order => %w(lastname firstname id), - :setting_order => 5 - }, + :string => '#{lastname}#{firstname}', + :order => %w(lastname firstname id), + :setting_order => 5 + }, :lastname_comma_firstname => { - :string => '#{lastname}, #{firstname}', - :order => %w(lastname firstname id), - :setting_order => 6 - }, + :string => '#{lastname}, #{firstname}', + :order => %w(lastname firstname id), + :setting_order => 6 + }, :lastname => { - :string => '#{lastname}', - :order => %w(lastname id), - :setting_order => 7 - }, + :string => '#{lastname}', + :order => %w(lastname id), + :setting_order => 7 + }, :username => { - :string => '#{login}', - :order => %w(login id), - :setting_order => 8 - }, + :string => '#{login}', + :order => %w(login id), + :setting_order => 8 + }, } MAIL_NOTIFICATION_OPTIONS = [