<%= f.select :default_issue_query_id, project_default_issue_query_options(@project), include_blank: l(:label_none) %><%=l 'text_allowed_queries_to_select' %>
<% end %> + +| + + | ++ <%= select_tag 'project[default_tracker_id_for_all_roles]', project_default_tracker_options(@project), prompt: l(:label_none) %> + | +
| + + | ++ |
| <%= role.name %> | ++ <%= select_tag "project[default_tracker_ids_by_role][#{role.id}]", project_default_tracker_options(@project, role), prompt: l(:label_none) %> + | +
<%= submit_tag l(:button_save) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 3f60e9e73..afca35f1a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1412,3 +1412,6 @@ en: text_user_destroy_confirmation: "Are you sure you want to delete this user and remove all references to them? This cannot be undone. Often, locking a user instead of deleting them is the better solution. To confirm, please enter their login (%{login}) below." text_project_destroy_enter_identifier: "To confirm, please enter the project's identifier (%{identifier}) below." field_name_or_email_or_login: Name, email or login + label_default_tracker: Default tracker + label_default_tracker_for_all_roles: For all roles + label_default_tracker_by_role: By role diff --git a/config/locales/ja.yml b/config/locales/ja.yml index d5b08b4b3..762787a17 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1438,3 +1438,6 @@ ja: text_select_apply_issue_status: このステータスを適用 field_name_or_email_or_login: 姓名・メールアドレス・ログインID text_default_active_job_queue_changed: キューアダプターがデフォルト (開発・テスト用) 以外のものに変更済み + label_default_tracker: デフォルトのトラッカー + label_default_tracker_for_all_roles: すべてのロールで共通 + label_default_tracker_by_role: ロールごとに設定する diff --git a/db/migrate/20231031075958_create_project_default_trackers.rb b/db/migrate/20231031075958_create_project_default_trackers.rb new file mode 100644 index 000000000..3ce099562 --- /dev/null +++ b/db/migrate/20231031075958_create_project_default_trackers.rb @@ -0,0 +1,11 @@ +class CreateProjectDefaultTrackers < ActiveRecord::Migration[6.1] + def change + create_table :project_default_trackers do |t| + t.integer :project_id, :null => false + t.integer :role_id, :null => true + t.integer :tracker_id, :null => true + end + + add_index :project_default_trackers, [:project_id, :tracker_id, :role_id], :unique => true, :name => :project_default_trackers_role_id + end +end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index b8580cd15..23d98e814 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -3529,6 +3529,20 @@ class IssuesControllerTest < Redmine::ControllerTest end end + def test_new_should_preselect_default_tracker + ProjectDefaultTracker.create!( + :project_id => 1, :tracker_id => 3, :role_id => nil + ) + assert_not_equal Project.find(1).trackers.first.id, 3 + + @request.session[:user_id] = 2 + get(:new, :params => {:project_id => 1}) + assert_response :success + assert_select 'select[name=?]', 'issue[tracker_id]' do + assert_select 'option[value=?][selected=selected]', '3' + end + end + def test_get_new_with_list_custom_field @request.session[:user_id] = 2 get( diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 0ac0ecc36..8f403cd35 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -1047,6 +1047,7 @@ class ProjectsControllerTest < Redmine::ControllerTest assert_select 'input[name=?]', 'project[issue_custom_field_ids][]' assert_select 'select[name=?]', 'project[default_version_id]', 1 assert_select 'select[name=?]', 'project[default_assigned_to_id]', 1 + assert_select 'select[name=?]', 'project[default_tracker_id_for_all_roles]', 1 end def test_update diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 14124f7bd..f3add5087 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -651,6 +651,45 @@ class IssueTest < ActiveSupport::TestCase assert_equal version, issue.fixed_version end + def test_setting_project_should_set_tracker_to_default_tracker_for_all_roles + issue = Issue.new(:project_id => 1) + assert_nil issue.tracker + + ProjectDefaultTracker.create!( + :project_id => 1, :tracker_id => 3, :role_id => nil + ) + + issue = Issue.new(:project_id => 1) + assert_equal 3, issue.tracker_id + assert_not_equal Project.find(1).trackers.first, issue.tracker + end + + def test_setting_project_should_set_tracker_to_default_tracker_by_role + User.current = User.find_by_login('jsmith') + issue = Issue.new(:project_id => 1) + assert_nil issue.tracker_id + + ProjectDefaultTracker.create!( + :project_id => 1, :tracker_id => 3, :role_id => 1 + ) + User.current = User.find_by_login('jsmith') + + issue = Issue.new(:project_id => 1) + assert_equal 3, issue.tracker_id + assert_equal 1, User.current.roles_for_project(Project.find(1)).first.id + end + + def test_setting_project_should_not_set_a_disallowed_tracker + disallowed_tracker = Tracker.generate! + ProjectDefaultTracker.create!( + :project_id => 1, :tracker_id => disallowed_tracker.id, :role_id => nil + ) + + issue = Issue.new(:project_id => 1) + assert_nil issue.tracker_id + assert_not_includes Project.find(1).trackers.pluck(:id), disallowed_tracker.id + end + def test_default_assigned_to_based_on_category_should_be_set_on_create user = User.find(3) category = IssueCategory.create!(:project_id => 1, :name => 'With default assignee', :assigned_to_id => 3)