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

Merged in paulis/processmaker/PM-4507 (pull request #3412)

Browse Source 
PM-4507
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-18 16:43:03 -04:00
parent eee2610cf1 ed01eaaff3
commit 40f53ce46f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/cron_single.php
View File

@@ -84,6 +84,7 @@ try {
G::LoadSystem('dvEditor');
G::LoadSystem('table');
G::LoadSystem('pagedTable');
G::LoadSystem('httpProxyController');
G::LoadClass('system');
require_once('propel/Propel.php');
@@ -150,6 +151,7 @@ try {
G::LoadClass('processes');
G::LoadClass('derivation');
G::LoadClass('dates'); //Load Criteria
G::LoadClass('spool');
//Set variables
/*----------------------------------********---------------------------------*/

6
workflow/engine/classes/class.wsBase.php
View File

@@ -2391,7 +2391,11 @@ class wsBase
if (isset($val['NEXT_TASK']['USER_ASSIGNED'])) {
$usrasgdUid = $val['NEXT_TASK']['USER_ASSIGNED']['USR_UID'];
$usrasgdUserName = '(' . $val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'] . ')';
if(isset($val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'])){
$usrasgdUserName = '(' . $val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'] . ')';
}else{
$usrasgdUserName = '';
}
}
$nodeNext['TAS_UID'] = $val['NEXT_TASK']['TAS_UID'];