redmine_plugins/redmine_custom_workflows
1
0
Fork 0
mirror of https://github.com/anteo/redmine_custom_workflows.git synced 2026-01-26 00:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue status validation (#8938)

Browse Source
This commit is contained in:
Anton Argirov 2012-10-05 16:11:37 +07:00
parent d9a6f1feae
commit d7f38170cc
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/redmine_custom_workflows/issue_patch.rb
View File

@ -13,8 +13,9 @@ module RedmineCustomWorkflows
module InstanceMethods module InstanceMethods
def validate_status def validate_status
return true unless @extra_validation return true unless @saved_attributes && @saved_attributes['status_id'] != status_id &&
if status_id_was != status_id && !new_statuses_allowed_to(User.current, new_record?).collect(&:id).include?(status_id) !new_statuses_allowed_to(User.current, new_record?).collect(&:id).include?(status_id)
status_was = IssueStatus.find_by_id(status_id_was) status_was = IssueStatus.find_by_id(status_id_was)
status_new = IssueStatus.find_by_id(status_id) status_new = IssueStatus.find_by_id(status_id)
@ -22,7 +23,6 @@ module RedmineCustomWorkflows
:old_status => status_was && status_was.name, :old_status => status_was && status_was.name,
:new_status => status_new && status_new.name :new_status => status_new && status_new.name
end end
end
def run_custom_workflows(on) def run_custom_workflows(on)
return true unless project && project.module_enabled?(:custom_workflows_module) return true unless project && project.module_enabled?(:custom_workflows_module)
@ -47,10 +47,9 @@ module RedmineCustomWorkflows
end end
def before_save_custom_workflows def before_save_custom_workflows
saved_attributes = attributes.dup @saved_attributes = attributes.dup
@extra_validation = true result = run_custom_workflows(:before_save) && (@saved_attributes == attributes || valid?)
result = run_custom_workflows(:before_save) && (saved_attributes == attributes || valid?) @saved_attributes = nil
@extra_validation = false
result result
end end