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

Merged in luisfernandosl/processmaker/PM-912 (pull request #1195)

Browse Source 
PM 912 "16253: Creation date on designer does..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-11-13 08:52:07 -04:00
parent b99524d4d8 b0f9a16fd0
commit c59a62d105
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,6 +644,14 @@ class Process extends BaseProcess
$oCriteria->addJoin( ProcessPeer::PRO_CREATE_USER, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
$oCriteria->addJoin( ProcessPeer::PRO_CATEGORY, ProcessCategoryPeer::CATEGORY_UID, Criteria::LEFT_JOIN );
if ($this->sort == "PRO_CREATE_DATE") {
if ($this->dir == "DESC") {
$oCriteria->addDescendingOrderByColumn(ProcessPeer::PRO_CREATE_DATE);
} else {
$oCriteria->addAscendingOrderByColumn(ProcessPeer::PRO_CREATE_DATE);
}
}
if ($userLogged != "") {
$oCriteria->add(
$oCriteria->getNewCriterion(ProcessPeer::PRO_TYPE_PROCESS, "PUBLIC", Criteria::EQUAL)->addOr(
@@ -782,10 +790,13 @@ class Process extends BaseProcess
if ($limit == '') {
$limit = count($aProcesses);
}
if ($this->dir=='ASC') {
usort( $aProcesses, array($this, "ordProcessAsc") );
} else {
usort( $aProcesses, array($this, "ordProcessDesc") );
if ($this->sort != "PRO_CREATE_DATE") {
if ($this->dir == "ASC") {
usort($aProcesses, array($this, "ordProcessAsc"));
} else {
usort($aProcesses, array($this, "ordProcessDesc"));
}
}
return $aProcesses;