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

Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-2902

Browse Source
This commit is contained in:
Paula Quispe
2017-03-23 11:39:22 -04:00
parent ab35a1544b 56f42c78c6
commit 740ba903fc
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.pmFunctions.php
View File

@@ -30,8 +30,12 @@
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
use ProcessMaker\Util\ElementTranslation; use ProcessMaker\Util\ElementTranslation;
if (! class_exists( 'PMScript' )) { if (!class_exists('Monolog\Logger')) {
G::LoadClass( 'pmScript' ); Bootstrap::initVendors();
}
if (!class_exists('PMScript')) {
G::LoadClass('pmScript');
} }
/** /**

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

@@ -297,6 +297,15 @@ class ListParticipatedLast extends BaseListParticipatedLast
$aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'".$category."'"); $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'".$category."'");
$criteria->addJoinMC($aConditions, Criteria::INNER_JOIN); $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
} }
//Those filters: $newestthan, $oldestthan is used from mobile GET /light/participated
if ($newestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN ));
}
if ($oldestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
}
} }
public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '') public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '')