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

Merged in paulis/processmaker/PM-2923 (pull request #2366)

Browse Source 
PM-2923: I used refreshTotal only when the userUid isn't empty (Self service)
This commit is contained in:
Julio Cesar Laura Avendaño
2015-06-22 12:40:42 -04:00
parent fbd199a69a b7b4a1d14b
commit 2713b6f1e7
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/class.derivation.php
View File

@@ -907,6 +907,20 @@ class Derivation
//Create the new case in the sub-process
// set the initial date to null the time its created
$aNewCase = $this->case->startCase( $aSP['TAS_UID'], $aSP['USR_UID'], true, $appFields);
//Create record in table APP_ASSIGN_SELF_SERVICE_VALUE
$taskSub = new Task();
$arrayNextTaskData = $taskSub->load($aSP["TAS_UID"]);
if ($arrayNextTaskData["TAS_ASSIGN_TYPE"] == "SELF_SERVICE" && trim($arrayNextTaskData["TAS_GROUP_VARIABLE"]) != "") {
$nextTaskGroupVariable = trim($arrayNextTaskData["TAS_GROUP_VARIABLE"], " @#");
if (isset($appFields["APP_DATA"][$nextTaskGroupVariable]) && trim($appFields["APP_DATA"][$nextTaskGroupVariable]) != "") {
$appAssignSelfServiceValue = new AppAssignSelfServiceValue();
$appAssignSelfServiceValue->create($aNewCase['APPLICATION'], $aNewCase['INDEX'], array("PRO_UID" => $aNewCase['PROCESS'], "TAS_UID" => $aSP["TAS_UID"], "GRP_UID" => trim($appFields["APP_DATA"][$nextTaskGroupVariable])));
}
}
//Copy case variables to sub-process case
$aFields = unserialize( $aSP['SP_VARIABLES_OUT'] );
$aNewFields = array ();

4
workflow/engine/classes/model/ListCompleted.php
View File

@@ -104,7 +104,9 @@ class ListCompleted extends BaseListCompleted
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'completed');
if($data['USR_UID'] != ''){
$users->refreshTotal($data['USR_UID'], 'add', 'completed');
}
if ($data['DEL_PREVIOUS'] != 0) {
$criteria = new Criteria();
$criteria->addSelectColumn(TaskPeer::TAS_TYPE);

4
workflow/engine/classes/model/ListInbox.php
View File

@@ -306,7 +306,9 @@ class ListInbox extends BaseListInbox
}
}
} else {
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
if($data['USR_UID'] !=''){
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}
if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
} else {

2
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -36,6 +36,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$data['APP_STATUS'] = $aRow['APP_STATUS'];
if ($data['USR_UID'] != 'SELF_SERVICES') {
if($data['USR_UID'] != ''){
$criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
@@ -51,6 +52,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'participated');
}
}
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );