aas/additionals
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Standard settings should not change default redmine behaviour

Browse Source
This commit is contained in:
Alexander Meindl
2017-08-31 06:01:39 +02:00
parent 8ef4d5d76b
commit aa954d857c
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/settings.yml
View File

@ -6,16 +6,19 @@ disabled_modules:
external_urls: 1 external_urls: 1
global_footer: '' global_footer: ''
global_sidebar: '' global_sidebar: ''
wiki_pdf_header: ''
wiki_pdf_remove_title: 0
wiki_pdf_remove_attachments: 0
global_wiki_footer: '' global_wiki_footer: ''
global_wiki_header: '' global_wiki_header: ''
global_wiki_sidebar: '' global_wiki_sidebar: ''
issue_autowatch_involved: 1 issue_assign_to_x: ''
issue_auto_assign_role: '' issue_auto_assign_role: ''
issue_auto_assign_status: '' issue_auto_assign_status: ''
issue_auto_assign: 0 issue_auto_assign: 0
issue_autowatch_involved: 0
issue_close_with_open_children: 0
issue_current_user_status: 0
issue_status_change: 0
issue_status_x: ''
issue_status_y: ''
legacy_smiley_support: 0 legacy_smiley_support: 0
new_ticket_message: "Don't forget to define acceptance criteria!" new_ticket_message: "Don't forget to define acceptance criteria!"
overview_bottom: '' overview_bottom: ''
@ -25,3 +28,6 @@ project_overview_content: 'Go to admin area and define a nice wiki text here as
remove_help: 0 remove_help: 0
remove_mypage: 0 remove_mypage: 0
remove_news: 0 remove_news: 0
wiki_pdf_header: ''
wiki_pdf_remove_attachments: 0
wiki_pdf_remove_title: 0

6
lib/additionals/patches/issue_patch.rb
View File

@ -114,7 +114,7 @@ module Additionals
def validate_current_user_status def validate_current_user_status
return true unless Additionals.setting?(:issue_current_user_status) return true unless Additionals.setting?(:issue_current_user_status)
return true if Additionals.settings[:issue_assign_to_x].nil? return true if Additionals.settings[:issue_assign_to_x].blank?
if (assigned_to_id_changed? || status_id_changed?) && if (assigned_to_id_changed? || status_id_changed?) &&
(Additionals.settings[:issue_assign_to_x].include? status_id.to_s) && (Additionals.settings[:issue_assign_to_x].include? status_id.to_s) &&
(assigned_to_id.blank? || assigned_to_id != User.current.id) (assigned_to_id.blank? || assigned_to_id != User.current.id)
@ -124,8 +124,8 @@ module Additionals
def change_status_with_assigned_to_change def change_status_with_assigned_to_change
return true unless Additionals.setting?(:issue_status_change) return true unless Additionals.setting?(:issue_status_change)
return true if Additionals.settings[:issue_status_x].nil? return true if Additionals.settings[:issue_status_x].blank?
return true if Additionals.settings[:issue_status_y].nil? return true if Additionals.settings[:issue_status_y].blank?
if !assigned_to_id_changed? && if !assigned_to_id_changed? &&
status_id_changed? && status_id_changed? &&
(Additionals.settings[:issue_status_x].include? status_id_was.to_s) && (Additionals.settings[:issue_status_x].include? status_id_was.to_s) &&