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

Solve PR observations

Browse Source
This commit is contained in:
Paula Quispe
2017-04-27 16:07:20 -04:00
parent 4ba7c44c4e
commit 432f69a67f
5 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -471,22 +471,17 @@ class ListInbox extends BaseListInbox
//Filter Search
if ($search != '') {
$oTmpCriteria = '';
//If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) {
require_once(PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP . $this->additionalClassName . '.php');
require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $this->additionalClassName . '.php');
$oNewCriteria = new Criteria("workflow");
$oTmpCriteria = '';
$sw = 0;
}
$oTmpCriteria = $oNewCriteria->getNewCriterion(current($additionalColumns), "%" . $search . "%", Criteria::LIKE);
//We prepare the query related to the custom cases list
foreach ($additionalColumns as $key => $value) {
if ($sw === 0) {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE);
} else {
//We prepare the query related to the custom cases list
foreach (array_slice($additionalColumns, 1) as $value) {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria);
}
$sw = 1;
}
if (!empty($oTmpCriteria)) {
@@ -565,7 +560,6 @@ class ListInbox extends BaseListInbox
$criteria = $pmTable->addPMFieldsToList($list);
$this->additionalClassName = $pmTable->tableClassName;
$additionalColumns = $criteria->getSelectColumns();
$filters['usr_uid'] = $usr_uid;
$criteria->addSelectColumn(ListInboxPeer::APP_UID);