From 6cb30909819c9b5cafc4cbfa701c5fa0398d7dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Thu, 31 Jul 2014 16:17:03 +0200 Subject: [PATCH] Workflow OR not working for second reviewer #269 --- app/models/dmsf_workflow.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb index 480e6b82..a9a3e7c9 100644 --- a/app/models/dmsf_workflow.rb +++ b/app/models/dmsf_workflow.rb @@ -1,6 +1,6 @@ # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2013 Karel Picman +# Copyright (C) 2011-14 Karel Picman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -148,16 +148,15 @@ class DmsfWorkflow < ActiveRecord::Base end break if step_is_finished end - if step_is_finished - break - else - steps.each do |step| - step.dmsf_workflow_step_assignments.each do |assignment| - results << assignment if assignment.add?(dmsf_file_revision_id) - end + break if step_is_finished + end + unless step_is_finished + steps.each do |step| + step.dmsf_workflow_step_assignments.each do |assignment| + results << assignment if assignment.add?(dmsf_file_revision_id) end - return results end + return results end end results