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

PM-3516

Browse Source 
0018383 Error en el buscador de la bandeja "Participated"
This commit is contained in:
dheeyi
2015-09-25 15:15:50 -04:00
parent 9fa3c2d2bf
commit e9ff9f17e4
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'] : ""; $category = isset($filters['category']) ? $filters['category'] : "";
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : "";
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : "";
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : "";
if ($filter != '') { if ($filter != '') {
switch ($filter) { switch ($filter) {
@@ -215,11 +216,15 @@ class ListParticipatedLast extends BaseListParticipatedLast
} }
} }
if ($search != '') { if ($search != '' ) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion( ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE )-> $criteria->getNewCriterion( ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE )->
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_TAS_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 != '') { if ($process != '') {

2
workflow/engine/templates/cases/casesList.js
View File

@@ -1189,7 +1189,7 @@ Ext.onReady ( function() {
scope: this, scope: this,
'select': function() { 'select': function() {
filterStatus = comboStatus.value; filterStatus = comboStatus.value;
storeCases.setBaseParam( 'status', filterStatus); storeCases.setBaseParam( 'filterStatus', filterStatus);
storeCases.setBaseParam( 'start', 0); storeCases.setBaseParam( 'start', 0);
storeCases.setBaseParam( 'limit', pageSize); storeCases.setBaseParam( 'limit', pageSize);
//storeCases.load(); //storeCases.load();