From 9415fd0307ee55395fe36ed5c963d158cc1f2ead Mon Sep 17 00:00:00 2001
From: dheeyi william <dheeyi@gmail.com>
Date: Tue, 17 Jan 2017 14:49:09 -0400
Subject: [PATCH] HOR-2542 [MANTIS - 21928] Process Supervisor error when a
 user is not assigned to all groups in Supervisor List

---
 workflow/engine/classes/model/ProcessUser.php | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/classes/model/ProcessUser.php b/workflow/engine/classes/model/ProcessUser.php
index b3596142e..5f72d9bad 100644
--- a/workflow/engine/classes/model/ProcessUser.php
+++ b/workflow/engine/classes/model/ProcessUser.php
@@ -97,21 +97,21 @@ class ProcessUser extends BaseProcessUser
     {
         try {
             $oCriteria = new Criteria();
-            $oCriteria->add( ProcessUserPeer::PRO_UID, $proUid );
-            $oCriteria->add( ProcessUserPeer::PU_TYPE, 'SUPERVISOR' );
-            $oCriteria->add( ProcessUserPeer::USR_UID, $usrUid );
-            $dataset = ProcessUserPeer::doSelectRS( $oCriteria );
-            $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oCriteria->add(ProcessUserPeer::PRO_UID, $proUid);
+            $oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
+            $oCriteria->add(ProcessUserPeer::USR_UID, $usrUid);
+            $dataset = ProcessUserPeer::doSelectRS($oCriteria);
+            $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             //If the user is in Assigned supervisors list
-            if($dataset->next()){
+            if ($dataset->next()) {
                 return true;
             } else {
                 //If the user is in a group in Assigned supervisors list
                 $oCriteria = new Criteria();
-                $oCriteria->add( ProcessUserPeer::PRO_UID, $proUid );
-                $oCriteria->add( ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
-                $dataset = ProcessUserPeer::doSelectRS( $oCriteria );
-                $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                $oCriteria->add(ProcessUserPeer::PRO_UID, $proUid);
+                $oCriteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
+                $dataset = ProcessUserPeer::doSelectRS($oCriteria);
+                $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                 $oGroups = new Groups();
                 $aGroups = $oGroups->getActiveGroupsForAnUser($usrUid);
                 while ($dataset->next()) {
@@ -119,8 +119,6 @@ class ProcessUser extends BaseProcessUser
                     $groupUid = $row['USR_UID'];
                     if (in_array($groupUid, $aGroups)) {
                         return true;
-                    } else {
-                        return false;
                     }
                 }
                 return false;