From 45335d4e9e7d7d4aa89dbc282c52dc1b0368b116 Mon Sep 17 00:00:00 2001 From: vincent-clipet Date: Thu, 11 Aug 2016 16:44:07 +0200 Subject: [PATCH] ADD :: Config option for resetting the status when copying an issue --- app/models/issue.rb | 6 +++++- app/views/settings/_issues.html.erb | 2 ++ config/locales/en.yml | 1 + config/locales/fr.yml | 1 + config/settings.yml | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 0b8a2b2..4edcf00 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -899,7 +899,11 @@ class Issue < ActiveRecord::Base # Returns an array of statuses that user is able to apply def new_statuses_allowed_to(user=User.current, include_default=false) if new_record? && @copied_from - [default_status, @copied_from.status].compact.uniq.sort + if Setting.reset_issue_status_on_copy? + [default_status] + else + [default_status, @copied_from.status].compact.uniq.sort + end else initial_status = nil if new_record? diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb index f29a6d4..b8e9e5e 100644 --- a/app/views/settings/_issues.html.erb +++ b/app/views/settings/_issues.html.erb @@ -5,6 +5,8 @@

<%= setting_select :link_copied_issue, link_copied_issue_options %>

+

<%= setting_check_box :reset_issue_status_on_copy %>

+

<%= setting_select :cross_project_subtasks, cross_project_subtasks_options %>

<%= setting_check_box :issue_group_assignment %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 7c07adb..306a2ab 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -440,6 +440,7 @@ en: setting_force_default_language_for_anonymous: Force default language for anonymous users setting_force_default_language_for_loggedin: Force default language for logged-in users setting_link_copied_issue: Link issues on copy + setting_reset_issue_status_on_copy: Reset status when copying an issue setting_max_additional_emails: Maximum number of additional email addresses setting_search_results_per_page: Search results per page setting_attachment_extensions_allowed: Allowed extensions diff --git a/config/locales/fr.yml b/config/locales/fr.yml index bf96702..bd1dd53 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -450,6 +450,7 @@ fr: setting_force_default_language_for_anonymous: Forcer la langue par défault pour les utilisateurs anonymes setting_force_default_language_for_loggedin: Forcer la langue par défault pour les utilisateurs identifiés setting_link_copied_issue: Lier les demandes lors de la copie + setting_reset_issue_status_on_copy: Réinitialiser le statut lors d'une copie de demande setting_max_additional_emails: Nombre maximal d'adresses email additionnelles setting_search_results_per_page: Résultats de recherche affichés par page setting_attachment_extensions_allowed: Extensions autorisées diff --git a/config/settings.yml b/config/settings.yml index 807f9b7..cfb7ac6 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -169,6 +169,8 @@ parent_issue_done_ratio: default: 'derived' link_copied_issue: default: 'ask' +reset_issue_status_on_copy: + default: 0 issue_group_assignment: default: 0 default_issue_start_date_to_creation_date: -- 2.8.1.windows.1