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

Merged in dheeyi/processmaker/PM-3516 (pull request #2843)

Browse Source 
PM-3516
This commit is contained in:
Julio Cesar Laura Avendaño
2015-09-28 12:02:10 -03:00
parent 5695176b73 e9ff9f17e4
commit 770e6906e0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,6 +203,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$category = isset($filters['category']) ? $filters['category'] : "";
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
if ($filter != '') {
switch ($filter) {
@@ -215,11 +216,15 @@ class ListParticipatedLast extends BaseListParticipatedLast
}
}
if ($search != '') {
if ($search != '' ) {
$criteria->add(
$criteria->getNewCriterion( ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE )->
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE )->
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::LIKE ) ) ) );
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::LIKE ) ) ) );
}
if($filterStatus != ''){
$criteria->add(ListParticipatedLastPeer::APP_STATUS, '%' . $filterStatus . '%', Criteria::LIKE );
}
if ($process != '') {