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

I send the parameter objectUid

Browse Source
This commit is contained in:
Paula Quispe
2017-03-16 16:39:22 -04:00
parent 465e18d493
commit 915b96da90
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.case.php
View File

@@ -5897,6 +5897,7 @@ class Cases
$proUid, $proUid,
$opTaskSource, $opTaskSource,
'OUTPUT', 'OUTPUT',
$opObjUid,
$aCase['APP_STATUS'] $aCase['APP_STATUS']
); );
//For Inputs //For Inputs
@@ -5905,6 +5906,7 @@ class Cases
$proUid, $proUid,
$opTaskSource, $opTaskSource,
'INPUT', 'INPUT',
$opObjUid,
$aCase['APP_STATUS'] $aCase['APP_STATUS']
); );
@@ -5939,6 +5941,7 @@ class Cases
$proUid, $proUid,
$opTaskSource, $opTaskSource,
'INPUT', 'INPUT',
$opObjUid,
$aCase['APP_STATUS'] $aCase['APP_STATUS']
); );
break; break;
@@ -5948,6 +5951,7 @@ class Cases
$proUid, $proUid,
$opTaskSource, $opTaskSource,
'OUTPUT', 'OUTPUT',
$opObjUid,
$aCase['APP_STATUS'] $aCase['APP_STATUS']
); );
break; break;

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

@@ -359,11 +359,12 @@ class ObjectPermission extends BaseObjectPermission
* @param string $proUid the uid of the process * @param string $proUid the uid of the process
* @param string $opTaskSource the uid of a task selected in origin task * @param string $opTaskSource the uid of a task selected in origin task
* @param string $obType can be INPUT or OUTPUT * @param string $obType can be INPUT or OUTPUT
* @param string $opObjUid uid of object [specific input or specific ouput]
* @param string $statusCase the status of the case COMPLETED, TO_DO * @param string $statusCase the status of the case COMPLETED, TO_DO
* *
* @return array with the uid of input or outputs * @return array with the uid of input or outputs
*/ */
public function objectPermissionByOutputInput ($appUid, $proUid, $opTaskSource, $obType = 'OUTPUT', $statusCase = '') public function objectPermissionByOutputInput ($appUid, $proUid, $opTaskSource, $obType = 'OUTPUT', $opObjUid = '', $statusCase = '')
{ {
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID); $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
@@ -378,6 +379,9 @@ class ObjectPermission extends BaseObjectPermission
if ($statusCase != 'COMPLETED' && $opTaskSource != '' && (int)$opTaskSource != 0) { if ($statusCase != 'COMPLETED' && $opTaskSource != '' && (int)$opTaskSource != 0) {
$oCriteria->add(AppDelegationPeer::TAS_UID, $opTaskSource); $oCriteria->add(AppDelegationPeer::TAS_UID, $opTaskSource);
} }
if ($opObjUid != '' && $opObjUid != '0') {
$oCriteria->add(AppDocumentPeer::DOC_UID, $opObjUid);
}
switch ($obType) { switch ($obType) {
case 'INPUT': case 'INPUT':
$oCriteria->add( $oCriteria->add(