From 28f37adcd36c5b19665096c9934ab8787dd25f64 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 20 Jun 2019 09:05:36 +0000 Subject: [PATCH] Add "<< me >>" option to user format issue custom fields (#31444). Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@18288 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/field_format.rb | 5 ++++- test/functional/context_menus_controller_test.rb | 2 +- test/functional/issues_controller_test.rb | 4 ++-- .../lib/redmine/field_format/user_field_format_test.rb | 8 ++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index d11dbee7f..e7c3ffc2b 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -818,7 +818,10 @@ module Redmine field_attributes :user_role def possible_values_options(custom_field, object=nil) - possible_values_records(custom_field, object).map {|u| [u.name, u.id.to_s]} + users = possible_values_records(custom_field, object) + options = users.map {|u| [u.name, u.id.to_s]} + options = [["<< #{l(:label_me)} >>", User.current.id]] + options if users.include?(User.current) + options end def possible_values_records(custom_field, object=nil) diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index 746f2f97f..5f6d309b5 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -190,7 +190,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest assert_select "li.cf_#{field.id}" do assert_select 'a[href="#"]', :text => 'User' assert_select 'ul' do - assert_select 'a', Project.find(1).members.count + 1 + assert_select 'a', Project.find(1).members.count + 2 # users + 'none' + 'me' assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=2", :text => 'John Smith' assert_select 'a[href=?]', "/issues/bulk_update?ids%5B%5D=1&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=__none__", :text => 'none' end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 07ae9649c..2945e8a0a 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2883,7 +2883,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :success assert_select 'select[name=?][multiple=multiple]', "issue[custom_field_values][#{field.id}][]" do - assert_select 'option', Project.find(1).users.count + assert_select 'option', Project.find(1).users.count + 1 # users + 'me' assert_select 'option[value="2"]', :text => 'John Smith' end assert_select 'input[name=?][type=hidden][value=?]', "issue[custom_field_values][#{field.id}][]", '' @@ -5673,7 +5673,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :success assert_select 'select.user_cf[name=?]', "issue[custom_field_values][#{field.id}]" do - assert_select 'option', Project.find(1).users.count + 2 # "no change" + "none" options + assert_select 'option', Project.find(1).users.count + 3 # "no change" + "none" + "me" options end end diff --git a/test/unit/lib/redmine/field_format/user_field_format_test.rb b/test/unit/lib/redmine/field_format/user_field_format_test.rb index 7fa53ad55..084345890 100644 --- a/test/unit/lib/redmine/field_format/user_field_format_test.rb +++ b/test/unit/lib/redmine/field_format/user_field_format_test.rb @@ -81,6 +81,14 @@ class Redmine::UserFieldFormatTest < ActionView::TestCase assert_equal ['Dave Lopper'], field.possible_values_options(project).map(&:first) end + def test_possible_values_options_should_return_project_members_and_me_if_logged_in + User.current = User.find(2) + field = IssueCustomField.new(:field_format => 'user') + project = Project.find(1) + + assert_equal ['<< me >>', 'Dave Lopper', 'John Smith'], field.possible_values_options(project).map(&:first) + end + def test_value_from_keyword_should_return_user_id field = IssueCustomField.new(:field_format => 'user') project = Project.find(1) -- 2.39.5