Merged in cochalo/processmaker (pull request #553)

Correccion de bug en sub process
This commit is contained in:
Erik Amaru Ortiz
2014-06-24 15:15:30 -04:00
2 changed files with 4 additions and 1 deletions

View File

@@ -122,7 +122,7 @@ class ProjectUser
$oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\GroupUserPeer::USR_UID);
$oCriteria->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN);
$oCriteria->addJoin(\TaskUserPeer::TAS_UID, \GroupUserPeer::GRP_UID, \Criteria::LEFT_JOIN);
$oCriteria->addJoin(\TaskUserPeer::USR_UID, \GroupUserPeer::GRP_UID, \Criteria::LEFT_JOIN);
$oCriteria->add(\TaskPeer::PRO_UID, $sProcessUID);
$oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
$oCriteria->add(\TaskUserPeer::TU_RELATION, 2);

View File

@@ -2,6 +2,9 @@
/*
* ProcessMaker Web Application Bootstrap
*/
if (isset($_SERVER['UNENCODED_URL'])) {
$_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
}
try {
$rootDir = realpath(__DIR__ . "/../../") . DIRECTORY_SEPARATOR;