Merge pull request #2125 from Jennydmz/BUG-13421

BUG-13421 Ordenamiento en el listado de procesos 'Designer'.
This commit is contained in:
julceslauhub
2013-11-08 05:50:43 -08:00
3 changed files with 68 additions and 26 deletions

View File

@@ -26,26 +26,29 @@ require_once 'classes/model/Process.php';
$start = isset( $_POST['start'] ) ? $_POST['start'] : 0;
$limit = isset( $_POST['limit'] ) ? $_POST['limit'] : '';
$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'ASC';
$sort = isset( $_POST['sort'] ) ? $_POST['sort'] : '';
$oProcess = new Process();
$oProcess->dir = $dir;
$oProcess->sort = $sort;
//$memcache = & PMmemcached::getSingleton( SYS_SYS );
$memkey = 'no memcache';
$memcacheUsed = 'not used';
$totalCount = 0;
if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
if (isset( $_POST['processName'] ))
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName'] );
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName']);
else
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'] );
$proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category']);
} else {
if (isset( $_POST['processName'] )) {
$memkey = 'processList-' . $start . '-' . $limit . '-' . $_POST['processName'];
$memcacheUsed = 'yes';
if (($proData = $memcache->get( $memkey )) === false) {
$proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName'] );
$proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName']);
$memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
$memcacheUsed = 'no';
}
@@ -54,12 +57,14 @@ if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
$memkeyTotal = $memkey . '-total';
$memcacheUsed = 'yes';
if (($proData = $memcache->get( $memkey )) === false || ($totalCount = $memcache->get( $memkeyTotal )) === false) {
$proData = $oProcess->getAllProcesses( $start, $limit );
$proData = $oProcess->getAllProcesses( $start, $limit);
$totalCount = $oProcess->getAllProcessesCount();
$memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
$memcache->set( $memkeyTotal, $totalCount, PMmemcached::ONE_HOUR );
$memcacheUsed = 'no';
}
} else {
$proData = $oProcess->orderMemcache($proData, $start, $limit);
}
}
}
$r = new stdclass();