fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.1' into HOR-1602

Browse Source
This commit is contained in:
dheeyi william
2016-08-12 14:37:19 -04:00
parent 4cf8fe1e50 c047b3fe42
commit ea3943b91f
9 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/bin/cron.php
View File

@@ -71,12 +71,18 @@ try {
$classLoader->add(PATH_TRUNK . 'framework' . PATH_SEP . 'src' . PATH_SEP, 'Maveriks');
$classLoader->add(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'src' . PATH_SEP, 'ProcessMaker');
$classLoader->add(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'src' . PATH_SEP);
$classLoader->addClass('Bootstrap', PATH_TRUNK . 'gulliver' . PATH_SEP . 'system' . PATH_SEP . 'class.bootstrap.php');
Bootstrap::initVendors();
//Enable Monolog
Bootstrap::LoadSystem( 'monologProvider' );
$classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
//Load classes
G::LoadThirdParty('propel', 'Propel');
G::LoadClass('system');
G::LoadClass('tasks');
G::LoadClass('pmException');
$arraySystemConfiguration = System::getSystemConfiguration();

5
workflow/engine/classes/class.case.php
View File

@@ -7060,7 +7060,10 @@ class Cases
$rows = array();
$rs->next();
while ($row = $rs->getRow()) {
$rows[$row['USR_UID']] = $row;
//In some cases the thread does not have a User Script task, Itee
if($row['USR_UID'] !== ''){
$rows[$row['USR_UID']] = $row;
}
$rs->next();
}
$response['criteria'] = $c;

2
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -603,7 +603,7 @@ class Ajax
$cases->reassignCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $TO_USR_UID);
$caseData = $app->load($_SESSION['APPLICATION']);
$userData = $user->load($TO_USR_UID);
//print_r($caseData);
$data['APP_NUMBER'] = $caseData['APP_NUMBER'];
$data['USER'] = $userData['USR_LASTNAME'] . ' ' . $userData['USR_FIRSTNAME']; //TODO change with the farmated username from environment conf
$result->status = 0;