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

Merged in release/3.2.2 (pull request #6011)

Browse Source 
Release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-08-25 15:08:57 +00:00
parent 52322493df ac538e40d7
commit e6bf50361c
7 changed files with 596 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/WorkspaceTools.php
View File

@@ -3898,8 +3898,8 @@ class WorkspaceTools
}
$this->initPropel(true);
$conf = new Configuration();
if (!$bExist = $conf->exists('MIGRATED_PLUGIN', 'singleton')) {
$pathSingleton = PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP . 'plugin.singleton';
$pathSingleton = PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP . 'plugin.singleton';
if ((!$bExist = $conf->exists('MIGRATED_PLUGIN', 'singleton')) && file_exists($pathSingleton)) {
$oPluginRegistry = unserialize(file_get_contents($pathSingleton));
$pluginAdapter = new PluginAdapter();
$pluginAdapter->migrate($oPluginRegistry);

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

@@ -406,6 +406,7 @@ class ListInbox extends BaseListInbox
$filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : '';
$newestthan = isset($filters['newestthan']) ? $filters['newestthan'] : '';
$oldestthan = isset($filters['oldestthan']) ? $filters['oldestthan'] : '';
$appUidCheck = isset($filters['appUidCheck']) ? $filters['appUidCheck'] : array();
//Check the inbox to call
switch ($action) {
@@ -503,6 +504,11 @@ class ListInbox extends BaseListInbox
if ($oldestthan != '') {
$criteria->add( $criteria->getNewCriterion( ListInboxPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN ));
}
//Review in the specific lot of cases
if (!empty($appUidCheck)) {
$criteria->add(ListInboxPeer::APP_UID, $appUidCheck, Criteria::IN);
}
}
/**

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

@@ -182,6 +182,7 @@ class ListUnassigned extends BaseListUnassigned
$category = isset($filters['category']) ? $filters['category'] : '';
$dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : '';
$dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : '';
$appUidCheck = isset($filters['appUidCheck']) ? $filters['appUidCheck'] : array();
//Filter Search
if ($search != '') {
@@ -208,6 +209,11 @@ class ListUnassigned extends BaseListUnassigned
$aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
$criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
}
//Review in the specific lot of cases
if (!empty($appUidCheck)) {
$criteria->add(ListUnassignedPeer::APP_UID, $appUidCheck, Criteria::IN);
}
}
/**