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

Merge pull request #2154 from Jennydmz/BUG-13421

Browse Source 
BUG-13421 Arreglando el contador de registros al realizar una busqueda de un proceso en Designer.
This commit is contained in:
julceslauhub
2013-11-21 08:14:04 -08:00
parent 7463aa601b b5bf4aac2b
commit 1bc16d1bc9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/model/Process.php
View File

@@ -754,8 +754,7 @@ class Process extends BaseProcess
usort( $aProcesses, array($this, "ordProcessAsc") ); usort( $aProcesses, array($this, "ordProcessAsc") );
} else { } else {
usort( $aProcesses, array($this, "ordProcessDesc") ); usort( $aProcesses, array($this, "ordProcessDesc") );
} }
$aProcesses = array_splice($aProcesses, $start, $limit);
return $aProcesses; return $aProcesses;
} }

6
workflow/engine/methods/processes/processesList.php
View File

@@ -51,7 +51,8 @@ if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
if ($proData === false) { if ($proData === false) {
$proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName']); $proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName']);
$memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR ); $memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
$totalCount = $oProcess->getAllProcessesCount(); $totalCount = count($proData);
$proData = array_splice($proData, $start, $limit);
$memcacheUsed = 'no'; $memcacheUsed = 'no';
} else { } else {
$proData = $oProcess->orderMemcache($proData, $start, $limit); $proData = $oProcess->orderMemcache($proData, $start, $limit);
@@ -64,7 +65,8 @@ if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
$memcacheUsed = 'yes'; $memcacheUsed = 'yes';
if (($proData = $memcache->get( $memkey )) === false || ($totalCount = $memcache->get( $memkeyTotal )) === false) { if (($proData = $memcache->get( $memkey )) === false || ($totalCount = $memcache->get( $memkeyTotal )) === false) {
$proData = $oProcess->getAllProcesses( $start, $limit); $proData = $oProcess->getAllProcesses( $start, $limit);
$totalCount = $oProcess->getAllProcessesCount(); $totalCount = count($proData);
$proData = array_splice($proData, $start, $limit);
$memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR ); $memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
$memcache->set( $memkeyTotal, $totalCount, PMmemcached::ONE_HOUR ); $memcache->set( $memkeyTotal, $totalCount, PMmemcached::ONE_HOUR );
$memcacheUsed = 'no'; $memcacheUsed = 'no';