diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-25 11:40:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-25 11:40:58 +0000 |
| commit | dd650c5c2602df95524dda91620a6b2016fa1c27 (patch) | |
| tree | ef2df338bbec32dfe30afd349ce4e6240f4e70a7 /app | |
| parent | bd9e5447eac4a148c235d83a665af54c8e1fb335 (diff) | |
| download | redmine-dd650c5c2602df95524dda91620a6b2016fa1c27.tar.gz redmine-dd650c5c2602df95524dda91620a6b2016fa1c27.zip | |
Setting to disable automatic closing of duplicates (#26192).
git-svn-id: http://svn.redmine.org/redmine/trunk@16697 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -rw-r--r-- | app/views/settings/_issues.html.erb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 33e6bf223..f984e0332 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1798,7 +1798,7 @@ class Issue < ActiveRecord::Base # Closes duplicates if the issue is being closed def close_duplicates - if closing? + if Setting.close_duplicate_issues? && closing? duplicates.each do |duplicate| # Reload is needed in case the duplicate was updated by a previous duplicate duplicate.reload diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb index f29a6d4ec..17e8ca99b 100644 --- a/app/views/settings/_issues.html.erb +++ b/app/views/settings/_issues.html.erb @@ -7,6 +7,8 @@ <p><%= setting_select :cross_project_subtasks, cross_project_subtasks_options %></p> +<p><%= setting_check_box :close_duplicate_issues %></p> + <p><%= setting_check_box :issue_group_assignment %></p> <p><%= setting_check_box :default_issue_start_date_to_creation_date %></p> |