Feature #4507 ยป 0001-Make-firstname-lastname-field-order-follow-Users-dis.patch
| app/models/user.rb | ||
|---|---|---|
|
USER_FORMATS[formatter || Setting.user_format] || USER_FORMATS[:firstname_lastname]
|
||
|
end
|
||
|
# Returns true if the selected user format puts lastname before firstname.
|
||
|
def self.lastname_before_firstname?(formatter = nil)
|
||
|
order = name_formatter(formatter)[:order]
|
||
|
return false unless order.include?('firstname') && order.include?('lastname')
|
||
|
order.index('lastname') < order.index('firstname')
|
||
|
end
|
||
|
# Returns an array of fields names than can be used to make an order statement for users
|
||
|
# according to how user names are displayed
|
||
|
# Examples:
|
||
| app/models/user_query.rb | ||
|---|---|---|
|
end
|
||
|
def default_columns_names
|
||
|
@default_columns_names ||= [:login, :firstname, :lastname, :mail, :admin, :created_on, :last_login_on]
|
||
|
@default_columns_names ||=
|
||
|
if !User.lastname_before_firstname?
|
||
|
[:login, :firstname, :lastname, :mail, :admin, :created_on, :last_login_on]
|
||
|
else
|
||
|
[:login, :lastname, :firstname, :mail, :admin, :created_on, :last_login_on]
|
||
|
end
|
||
|
end
|
||
|
def default_sort_criteria
|
||
| app/views/account/register.html.erb | ||
|---|---|---|
|
<p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
|
||
|
<% end %>
|
||
|
<% if User.lastname_before_firstname? %>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<% else %>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<% end %>
|
||
|
<p><%= f.text_field :mail, :required => true %></p>
|
||
|
<%= labelled_fields_for :pref, @user.pref do |pref_fields| %>
|
||
|
<p><%= pref_fields.check_box :hide_mail %></p>
|
||
| app/views/my/account.html.erb | ||
|---|---|---|
|
<div class="splitcontentleft">
|
||
|
<fieldset class="box tabular">
|
||
|
<legend><%=l(:label_information_plural)%></legend>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<% if User.lastname_before_firstname? %>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<% else %>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<% end %>
|
||
|
<p><%= f.text_field :mail, :required => true %></p>
|
||
|
<% unless @user.force_default_language? %>
|
||
|
<p><%= f.select :language, lang_options_for_select %></p>
|
||
| app/views/users/_form.html.erb | ||
|---|---|---|
|
<fieldset class="box tabular">
|
||
|
<legend><%=l(:label_information_plural)%></legend>
|
||
|
<p><%= f.text_field :login, :required => true, :size => 25 %></p>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<% if User.lastname_before_firstname? %>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<% else %>
|
||
|
<p><%= f.text_field :firstname, :required => true %></p>
|
||
|
<p><%= f.text_field :lastname, :required => true %></p>
|
||
|
<% end %>
|
||
|
<p><%= f.text_field :mail, :required => true %></p>
|
||
|
<% unless @user.force_default_language? %>
|
||
|
<p><%= f.select :language, lang_options_for_select %></p>
|
||
| test/functional/account_controller_test.rb | ||
|---|---|---|
|
end
|
||
|
end
|
||
|
def test_get_register_should_show_lastname_before_firstname_when_user_format_requires_it
|
||
|
with_settings :self_registration => '3', :user_format => 'lastname_firstname' do
|
||
|
get :register
|
||
|
assert_response :success
|
||
|
assert_operator @response.body.index('id="user_lastname"'), :<, @response.body.index('id="user_firstname"')
|
||
|
end
|
||
|
end
|
||
|
def test_get_register_should_detect_user_language
|
||
|
with_settings :self_registration => '3' do
|
||
|
@request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
|
||
| test/functional/my_controller_test.rb | ||
|---|---|---|
|
assert_select 'select[name=?]', 'user[language]'
|
||
|
end
|
||
|
def test_my_account_should_show_lastname_before_firstname_when_user_format_requires_it
|
||
|
with_settings :user_format => 'lastname_firstname' do
|
||
|
get :account
|
||
|
assert_response :success
|
||
|
assert_operator @response.body.index('id="user_lastname"'), :<, @response.body.index('id="user_firstname"')
|
||
|
end
|
||
|
end
|
||
|
def test_my_account_should_toggle_webhook_link_with_setting
|
||
|
User.find(2).roles.first.add_permission!(:use_webhooks)
|
||
| test/functional/users_controller_test.rb | ||
|---|---|---|
|
assert_select "tr#user-#{locked.id}", 0
|
||
|
end
|
||
|
def test_index_default_columns_should_show_lastname_before_firstname_when_user_format_requires_it
|
||
|
with_settings user_format: 'lastname_firstname' do
|
||
|
get :index
|
||
|
assert_response :success
|
||
|
lastname_header = @response.body.match(/<th[^>]*class="[^"]*\blastname\b[^"]*"[^>]*>/)
|
||
|
firstname_header = @response.body.match(/<th[^>]*class="[^"]*\bfirstname\b[^"]*"[^>]*>/)
|
||
|
assert_not_nil lastname_header
|
||
|
assert_not_nil firstname_header
|
||
|
assert_operator lastname_header.begin(0), :<, firstname_header.begin(0)
|
||
|
end
|
||
|
end
|
||
|
def test_index_with_status_filter
|
||
|
get :index, params: { set_filter: 1, f: ['status'], op: {status: '='}, v: {status: [3]} }
|
||
|
assert_response :success
|
||
| ... | ... | |
|
assert_select 'label[for=?]>span.required', 'user_password', 1
|
||
|
end
|
||
|
def test_new_should_show_lastname_before_firstname_when_user_format_requires_it
|
||
|
with_settings :user_format => 'lastname_firstname' do
|
||
|
get :new
|
||
|
assert_response :success
|
||
|
assert_operator @response.body.index('id="user_lastname"'), :<, @response.body.index('id="user_firstname"')
|
||
|
end
|
||
|
end
|
||
|
def test_create
|
||
|
assert_difference 'User.count' do
|
||
|
assert_difference 'ActionMailer::Base.deliveries.size' do
|
||
| test/unit/user_query_test.rb | ||
|---|---|---|
|
require_relative '../test_helper'
|
||
|
class UserQueryTest < ActiveSupport::TestCase
|
||
|
def test_default_columns_names_should_show_lastname_before_firstname_when_user_format_requires_it
|
||
|
with_settings user_format: 'lastname_firstname' do
|
||
|
assert_equal [:login, :lastname, :firstname, :mail, :admin, :created_on, :last_login_on],
|
||
|
UserQuery.new.default_columns_names
|
||
|
end
|
||
|
end
|
||
|
def test_default_columns_names_should_show_firstname_before_lastname_when_user_format_is_default
|
||
|
with_settings user_format: 'firstname_lastname' do
|
||
|
assert_equal [:login, :firstname, :lastname, :mail, :admin, :created_on, :last_login_on],
|
||
|
UserQuery.new.default_columns_names
|
||
|
end
|
||
|
end
|
||
|
def test_available_columns_should_include_user_custom_fields
|
||
|
query = UserQuery.new
|
||
|
assert_include :cf_4, query.available_columns.map(&:name)
|
||
| test/unit/user_test.rb | ||
|---|---|---|
|
end
|
||
|
end
|
||
|
def test_lastname_before_firstname_should_return_true_with_lastname_firstname_format
|
||
|
assert User.lastname_before_firstname?(:lastname_firstname)
|
||
|
end
|
||
|
def test_lastname_before_firstname_should_return_false_with_firstname_lastname_format
|
||
|
assert_not User.lastname_before_firstname?(:firstname_lastname)
|
||
|
end
|
||
|
def test_lastname_before_firstname_should_return_false_with_format_without_both_name_parts
|
||
|
assert_not User.lastname_before_firstname?(:username)
|
||
|
assert_not User.lastname_before_firstname?(:lastname)
|
||
|
end
|
||
|
test ".try_to_login with good credentials should return the user" do
|
||
|
user = User.try_to_login("admin", "admin")
|
||
|
assert_kind_of User, user
|
||