diff --git a/app/models/queries/filters/shared/any_user_name_attribute_filter.rb b/app/models/queries/filters/shared/any_user_name_attribute_filter.rb index e3ebec50c681..964076c8b9fa 100644 --- a/app/models/queries/filters/shared/any_user_name_attribute_filter.rb +++ b/app/models/queries/filters/shared/any_user_name_attribute_filter.rb @@ -50,16 +50,18 @@ def email_field_allowed? private def sql_concat_name - fields = [ - "users.firstname", "users.lastname", - "users.lastname", "users.firstname", - "users.login" - ] + fields = <<~SQL.squish + users.firstname, ' ', users.lastname, + ' ', + users.lastname, ' ', users.firstname, + ' ', + users.login + SQL - fields << "users.mail" if email_field_allowed? + fields << ", ' ',users.mail" if email_field_allowed? <<~SQL.squish - LOWER(CONCAT_WS(#{fields.join(',')})) + LOWER(CONCAT(#{fields})) SQL end end diff --git a/modules/team_planner/spec/features/query_handling_spec.rb b/modules/team_planner/spec/features/query_handling_spec.rb index 812e9def0f3b..3a9b71757b7c 100644 --- a/modules/team_planner/spec/features/query_handling_spec.rb +++ b/modules/team_planner/spec/features/query_handling_spec.rb @@ -33,6 +33,7 @@ require_relative "../../../../spec/features/views/shared_examples" RSpec.describe "Team planner query handling", :js, :with_cuprite, with_ee: %i[team_planner_view] do + shared_let(:standard) { create(:standard_global_role) } shared_let(:type_task) { create(:type_task) } shared_let(:type_bug) { create(:type_bug) } shared_let(:project) do diff --git a/modules/team_planner/spec/features/shared_context.rb b/modules/team_planner/spec/features/shared_context.rb index 0a2b06780053..5a7db6dfebab 100644 --- a/modules/team_planner/spec/features/shared_context.rb +++ b/modules/team_planner/spec/features/shared_context.rb @@ -30,6 +30,7 @@ require_relative "../support/pages/team_planner" RSpec.shared_context "with team planner full access" do + shared_let(:standard) { create(:standard_global_role) } shared_let(:project) do create(:project) end diff --git a/spec/factories/global_role_factory.rb b/spec/factories/global_role_factory.rb index ab14faeb2b3e..aee02ca6da4d 100644 --- a/spec/factories/global_role_factory.rb +++ b/spec/factories/global_role_factory.rb @@ -34,6 +34,7 @@ name { "Standard global role" } builtin { Role::BUILTIN_STANDARD_GLOBAL } initialize_with { GlobalRole.where(builtin: Role::BUILTIN_STANDARD_GLOBAL).first_or_initialize } + permissions { [:view_user_email] } end end end diff --git a/spec/features/projects/project_custom_fields/overview_page/shared_context.rb b/spec/features/projects/project_custom_fields/overview_page/shared_context.rb index 5b1a0852bbab..4d616bedaf2c 100644 --- a/spec/features/projects/project_custom_fields/overview_page/shared_context.rb +++ b/spec/features/projects/project_custom_fields/overview_page/shared_context.rb @@ -34,6 +34,7 @@ let!(:second_version) { create(:version, name: "Version 2", project:) } let!(:third_version) { create(:version, name: "Version 3", project:) } + shared_let(:standard) { create(:standard_global_role) } shared_let(:reader_role_without_project_attributes) do create(:project_role, permissions: %i[view_work_packages]) end diff --git a/spec/features/users/invite_user_modal/invite_user_modal_spec.rb b/spec/features/users/invite_user_modal/invite_user_modal_spec.rb index a1cc83e0199c..635c3fd71695 100644 --- a/spec/features/users/invite_user_modal/invite_user_modal_spec.rb +++ b/spec/features/users/invite_user_modal/invite_user_modal_spec.rb @@ -29,6 +29,7 @@ require "spec_helper" RSpec.describe "Invite user modal", :js, :with_cuprite do + shared_let(:standard) { create(:standard_global_role) } shared_let(:project) { create(:project) } shared_let(:work_package) { create(:work_package, project:) } diff --git a/spec/features/users/invite_user_modal/permission_lacking_current_project_spec.rb b/spec/features/users/invite_user_modal/permission_lacking_current_project_spec.rb index 0fa0a6524f07..978d2adb3aec 100644 --- a/spec/features/users/invite_user_modal/permission_lacking_current_project_spec.rb +++ b/spec/features/users/invite_user_modal/permission_lacking_current_project_spec.rb @@ -29,6 +29,7 @@ require "spec_helper" RSpec.describe "Inviting user in project the current user is lacking permission in", :js, :with_cuprite do + shared_let(:standard) { create(:standard_global_role) } let(:modal) do Components::Users::InviteUserModal.new project: invite_project, principal: other_user, diff --git a/spec/features/users/invite_user_modal/subproject_invite_spec.rb b/spec/features/users/invite_user_modal/subproject_invite_spec.rb index 81fab8697f30..8cc18f7c07bb 100644 --- a/spec/features/users/invite_user_modal/subproject_invite_spec.rb +++ b/spec/features/users/invite_user_modal/subproject_invite_spec.rb @@ -29,6 +29,7 @@ require "spec_helper" RSpec.describe "Invite user modal subprojects", :js, :with_cuprite do + shared_let(:standard) { create(:standard_global_role) } shared_let(:project) { create(:project, name: "Parent project") } shared_let(:subproject) { create(:project, name: "Subproject", parent: project) } shared_let(:work_package) { create(:work_package, project: subproject) }