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

BUG-13421 Ordenamiento en el listado de procesos 'Designer'.

Browse Source 
Correggiones para no usar variables de session.
This commit is contained in:
jennylee
2013-11-08 09:06:18 -04:00
parent c319bfa116
commit 4d357d136c
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,8 @@ class Process extends BaseProcess
* @var string
*/
protected $pro_title = '';
public $dir = 'ASC';
public $sort = '';
/**
* Get the [Pro_title] column value.
@@ -387,10 +389,10 @@ class Process extends BaseProcess
}
}
if ($_POST['dir']=='ASC') {
usort( $processes, 'ordProcessAsc' );
if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") );
} else {
usort( $processes, 'ordProcessDesc' );
usort( $processes, array($this, "ordProcessDesc") );
}
return $processes;
@@ -592,7 +594,7 @@ class Process extends BaseProcess
}
}
public function getAllProcesses ($start, $limit, $category = null, $processName = null, $counters = true, $reviewSubProcess = false, $dir = 'ASC')
public function getAllProcesses ($start, $limit, $category = null, $processName = null, $counters = true, $reviewSubProcess = false)
{
require_once PATH_RBAC . "model/RbacUsers.php";
require_once "classes/model/ProcessCategory.php";
@@ -748,10 +750,10 @@ class Process extends BaseProcess
if ($limit == '') {
$limit = count($aProcesses);
}
if ($dir=='ASC') {
usort( $aProcesses, 'ordProcessAsc' );
if ($this->dir=='ASC') {
usort( $aProcesses, array($this, "ordProcessAsc") );
} else {
usort( $aProcesses, 'ordProcessDesc' );
usort( $aProcesses, array($this, "ordProcessDesc") );
}
$aProcesses = array_splice($aProcesses, $start, $limit);
@@ -861,38 +863,37 @@ class Process extends BaseProcess
}
}
public function orderMemcache($dataMemcache, $start, $limit, $dir)
public function orderMemcache($dataMemcache, $start, $limit)
{
if ($dir=='ASC') {
usort( $dataMemcache, 'ordProcessAsc' );
if ($this->dir=='ASC') {
usort( $dataMemcache, array($this, "ordProcessAsc") );
} else {
usort( $dataMemcache, 'ordProcessDesc' );
usort( $dataMemcache, array($this, "ordProcessDesc") );
}
$dataMemcache = array_splice($dataMemcache, $start, $limit);
return $dataMemcache;
}
}
function ordProcessAsc ($a, $b)
{
if ($a[$_POST['sort']] > $b[$_POST['sort']]) {
public function ordProcessAsc ($a, $b)
{
if ($a[$this->sort] > $b[$this->sort]) {
return 1;
} elseif ($a[$_POST['sort']] < $b[$_POST['sort']]) {
} elseif ($a[$this->sort] < $b[$this->sort]) {
return - 1;
} else {
return 0;
}
}
}
function ordProcessDesc ($a, $b)
{
if ($a[$_POST['sort']] > $b[$_POST['sort']]) {
public function ordProcessDesc ($a, $b)
{
if ($a[$this->sort] > $b[$this->sort]) {
return - 1;
} elseif ($a[$_POST['sort']] < $b[$_POST['sort']]) {
} elseif ($a[$this->sort] < $b[$this->sort]) {
return 1;
} else {
return 0;
}
}
}