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

Merged in bugfix/HOR-3189 (pull request #5766)

Browse Source 
HOR-3189

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
jonathan Quispe
2017-07-26 15:56:47 +00:00
committed by Julio Cesar Laura Avendaño
parent 033e4b30f1 beed6f061a
commit 726319e799
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/ObjectPermission.php
View File

@@ -322,6 +322,7 @@ class ObjectPermission extends BaseObjectPermission
public function objectPermissionByDynaform ($appUid, $opTaskSource = 0, $opObjUid = '', $statusCase = '') public function objectPermissionByDynaform ($appUid, $opTaskSource = 0, $opObjUid = '', $statusCase = '')
{ {
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn("*");
$oCriteria->addJoin(ApplicationPeer::PRO_UID, StepPeer::PRO_UID); $oCriteria->addJoin(ApplicationPeer::PRO_UID, StepPeer::PRO_UID);
$oCriteria->addJoin(StepPeer::STEP_UID_OBJ, DynaformPeer::DYN_UID); $oCriteria->addJoin(StepPeer::STEP_UID_OBJ, DynaformPeer::DYN_UID);
$oCriteria->add(ApplicationPeer::APP_UID, $appUid); $oCriteria->add(ApplicationPeer::APP_UID, $appUid);
@@ -334,7 +335,6 @@ class ObjectPermission extends BaseObjectPermission
if ($opObjUid != '' && $opObjUid != '0') { if ($opObjUid != '' && $opObjUid != '0') {
$oCriteria->add(DynaformPeer::DYN_UID, $opObjUid); $oCriteria->add(DynaformPeer::DYN_UID, $opObjUid);
} }
$oCriteria->addAscendingOrderByColumn(StepPeer::STEP_POSITION); $oCriteria->addAscendingOrderByColumn(StepPeer::STEP_POSITION);
$oCriteria->setDistinct(); $oCriteria->setDistinct();

1
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -952,6 +952,7 @@ class Cases extends Api
/** /**
* Get Case Notes * Get Case Notes
* *
* @param string $app_uid {@min 1}{@max 32}
* @param int $start {@from path} * @param int $start {@from path}
* @param int $limit {@from path} * @param int $limit {@from path}
* @param string $sort {@from path} * @param string $sort {@from path}