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

Merge code github > bitbucket 2014-05-23 16:35

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-05-23 16:32:18 -04:00
parent 450d0ab6d1 6ae5fa6d36
commit 33fb82f376
75 changed files with 2274 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.processMap.php
View File

@@ -778,7 +778,7 @@ class processMap
$aFields['CONFIRM'] = G::LoadTranslation('ID_MSG_CONFIRM_DELETE_STEP');
global $G_PUBLISH;
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'steps/steps_List', $this->getStepsCriteria($sTaskUID), $aFields);
$G_PUBLISH->AddContent('propeltable', 'steps/paged-table', 'steps/steps_List', $this->getStepsCriteria($sTaskUID), $aFields);
G::RenderPage('publish', 'raw');
return true;
} catch (Exception $oError) {
@@ -3456,6 +3456,7 @@ class processMap
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->add(UsersPeer::USR_UID, $aUIDS, Criteria::IN);
$oCriteria->add(UsersPeer::USR_STATUS, array('ACTIVE', 'VACATION'), Criteria::IN);
$oCriteria->addAscendingOrderByColumn(UsersPeer::USR_FIRSTNAME);
$oDataset = UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);