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

Merged in bugfix/PMCORE-2957 (pull request #7904)

Browse Source 
PMCORE-2957

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Andrea Adamczyk
2021-04-28 13:26:39 +00:00
committed by Julio Cesar Laura Avendaño
parent 09b1af573f 4c7963b070
commit 52884f6937
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rbac/engine/classes/model/Roles.php
View File

@@ -118,8 +118,8 @@ class Roles extends BaseRoles
$criteria->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
$criteria->add(RolesPeer::ROL_CODE, RBAC::PROCESSMAKER_GUEST, Criteria::NOT_EQUAL);
$criteria->add(SystemsPeer::SYS_CODE, $systemCode);
$criteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$criteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$criteria->add(RolesPeer::ROL_CREATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
$criteria->add(RolesPeer::ROL_UPDATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
if (!empty($filter)) {
$criteria->add(RolesPeer::ROL_CODE, '%' . $filter . '%', Criteria::LIKE);

2
workflow/engine/methods/tracker/tracker_Ajax.php
View File

@@ -264,7 +264,7 @@ try {
$oCriteria = new Criteria('workflow');
$oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
$oCriteria->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
$oCriteria->add($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)->addOr($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, '')));
$oCriteria->add($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)->addOr($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, '0000-00-00 00:00:00')));
if (AppDelegationPeer::doCount($oCriteria) > 0) {
$oStage->color = '#FF0000';
} else {