fernando/luos
1
0
Fork 0
Code Releases 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

2
workflow/engine/classes/class.pmTable.php
View File

@@ -992,7 +992,7 @@ class PmTable
$listTablePeer = 'ListInboxPeer'; $listTablePeer = 'ListInboxPeer';
break; break;
} }
//Some PMtables does not have the APP NUMBER columns, but if exist we must be use //Some PM tables don’t have the APP NUMBER column; but if exists, we must use it
if (in_array($tableName.'.APP_NUMBER', $oCriteria->getSelectColumns())) { if (in_array($tableName.'.APP_NUMBER', $oCriteria->getSelectColumns())) {
$oCriteria->addJoin($listTablePeer::APP_NUMBER, $tableName.'.APP_NUMBER', Criteria::LEFT_JOIN); $oCriteria->addJoin($listTablePeer::APP_NUMBER, $tableName.'.APP_NUMBER', Criteria::LEFT_JOIN);
} else { } else {

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

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

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

@@ -283,21 +283,16 @@ class ListParticipatedLast extends BaseListParticipatedLast
if ($search != '') { if ($search != '') {
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { 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"); $oNewCriteria = new Criteria("workflow");
$oTmpCriteria = ''; $oTmpCriteria = $oNewCriteria->getNewCriterion(current($additionalColumns), "%" . $search . "%", Criteria::LIKE);
$sw = 0;
}
//We prepare the query related to the custom cases list //We prepare the query related to the custom cases list
foreach ($additionalColumns as $key => $value) { foreach (array_slice($additionalColumns, 1) as $value) {
if ($sw === 0) {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE);
} else {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria); $oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria);
} }
$sw = 1;
} }
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)

15
workflow/engine/classes/model/ListPaused.php
View File

@@ -242,21 +242,16 @@ class ListPaused extends BaseListPaused
if ($search != '') { if ($search != '') {
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { 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"); $oNewCriteria = new Criteria("workflow");
$oTmpCriteria = ''; $oTmpCriteria = $oNewCriteria->getNewCriterion(current($additionalColumns), "%" . $search . "%", Criteria::LIKE);
$sw = 0;
}
//We prepare the query related to the custom cases list //We prepare the query related to the custom cases list
foreach ($additionalColumns as $key => $value) { foreach (array_slice($additionalColumns, 1) as $value) {
if ($sw === 0) {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE);
} else {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria); $oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria);
} }
$sw = 1;
} }
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)

15
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -186,21 +186,16 @@ class ListUnassigned extends BaseListUnassigned
if ($search != '') { if ($search != '') {
//If we have additional tables configured in the custom cases list, prepare the variables for search //If we have additional tables configured in the custom cases list, prepare the variables for search
if (count($additionalColumns) > 0) { 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"); $oNewCriteria = new Criteria("workflow");
$oTmpCriteria = ''; $oTmpCriteria = $oNewCriteria->getNewCriterion(current($additionalColumns), "%" . $search . "%", Criteria::LIKE);
$sw = 0;
}
//We prepare the query related to the custom cases list //We prepare the query related to the custom cases list
foreach ($additionalColumns as $key => $value) { foreach (array_slice($additionalColumns, 1) as $value) {
if ($sw === 0) {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE);
} else {
$oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria); $oTmpCriteria = $oNewCriteria->getNewCriterion($value, "%" . $search . "%", Criteria::LIKE)->addOr($oTmpCriteria);
} }
$sw = 1;
} }
if (!empty($oTmpCriteria)) { if (!empty($oTmpCriteria)) {
$criteria->add( $criteria->add(
$criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)