Merge remote branch 'upstream/master'

2014-06-26 16:51:24 -04:00
parent d34273d72b 553bf33ae6
commit a0a6e37f97
27 changed files with 218 additions and 87 deletions
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -3339,6 +3339,7 @@ class processMap
        $oCriteria->addJoin(ProcessUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
        $oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
        $oCriteria->add(ProcessUserPeer::PRO_UID, $sProcessUID);
+        $oCriteria->add(UsersPeer::USR_STATUS, "CLOSED", Criteria::NOT_EQUAL);
        $oCriteria->addAscendingOrderByColumn(UsersPeer::USR_FIRSTNAME);
        $oDataset = ProcessUserPeer::doSelectRS($oCriteria);
        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);