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

BUG 6639 When importing a process it is displaying an error

Browse Source 
Fixed by validating if the imported permission has a correspondent object. This issue happens when a object has permissions defined and it is deleted due an old bug
This commit is contained in:
Hugo Loza
2011-04-01 19:09:38 -04:00
parent aab27bfaaf
commit 34a0a5d5e8
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3217,6 +3217,22 @@ class processMap {
$sObjectType = G::LoadTranslation('ID_ALL'); $sObjectType = G::LoadTranslation('ID_ALL');
$sObject = G::LoadTranslation('ID_ALL'); $sObject = G::LoadTranslation('ID_ALL');
break; break;
case 'ANY' ://For backward compatibility (some process with ANY instead of ALL
$sObjectType = G::LoadTranslation('ID_ALL');
$sObject = G::LoadTranslation('ID_ALL');
break;
/* case 'ANY_DYNAFORM':
$sObjectType = G::LoadTranslation('ID_ANY_DYNAFORM');
$sObject = G::LoadTranslation('ID_ALL');
break;
case 'ANY_INPUT':
$sObjectType = G::LoadTranslation('ID_ANY_INPUT');
$sObject = G::LoadTranslation('ID_ALL');
break;
case 'ANY_OUTPUT':
$sObjectType = G::LoadTranslation('ID_ANY_OUTPUT');
$sObject = G::LoadTranslation('ID_ALL');
break; */
case 'DYNAFORM' : case 'DYNAFORM' :
$sObjectType = G::LoadTranslation('ID_DYNAFORM'); $sObjectType = G::LoadTranslation('ID_DYNAFORM');
if (($aRow ['OP_OBJ_UID'] != '') && ($aRow ['OP_OBJ_UID'] != '0')) { if (($aRow ['OP_OBJ_UID'] != '') && ($aRow ['OP_OBJ_UID'] != '0')) {
@@ -4167,7 +4183,11 @@ class processMap {
* @param string $sTaskUID * @param string $sTaskUID
* @param string $sIndex * @param string $sIndex
* @return void * @return void
<<<<<<< HEAD
* throw Exception $oError * throw Exception $oError
=======
* @throw Exception $oError
>>>>>>> 4cdf80a... BUG 6639 When importing a process it is displaying an error
*/ */
function subProcess_Properties($sProcessUID = '', $sTaskUID = '', $sIndex = '') { function subProcess_Properties($sProcessUID = '', $sTaskUID = '', $sIndex = '') {
try { //echo "$sProcessUID = '', $sTaskUID = '', $sIndex = ''"; try { //echo "$sProcessUID = '', $sTaskUID = '', $sIndex = ''";

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

@@ -756,10 +756,12 @@ class Processes {
} }
foreach ( $oData->objectPermissions as $key => $val ) { foreach ( $oData->objectPermissions as $key => $val ) {
if ( $val['OP_OBJ_TYPE'] == 'DYNAFORM' ) { if ( $val['OP_OBJ_TYPE'] == 'DYNAFORM' ) {
if(isset($map[ $val['OP_OBJ_UID'] ])){
$newGuid = $map[ $val['OP_OBJ_UID'] ]; $newGuid = $map[ $val['OP_OBJ_UID'] ];
$oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid; $oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid;
} }
} }
}
foreach ( $oData->stepSupervisor as $key => $val ) { foreach ( $oData->stepSupervisor as $key => $val ) {
if ( $val['STEP_TYPE_OBJ'] == 'DYNAFORM' ) { if ( $val['STEP_TYPE_OBJ'] == 'DYNAFORM' ) {
$newGuid = $map[ $val['STEP_UID_OBJ'] ]; $newGuid = $map[ $val['STEP_UID_OBJ'] ];
@@ -1338,10 +1340,12 @@ class Processes {
} }
foreach ( $oData->objectPermissions as $key => $val ) { foreach ( $oData->objectPermissions as $key => $val ) {
if ( $val['OP_OBJ_TYPE'] == 'INPUT_DOCUMENT' ) { if ( $val['OP_OBJ_TYPE'] == 'INPUT_DOCUMENT' ) {
if(isset($map[ $val['OP_OBJ_UID'] ])){
$newGuid = $map[ $val['OP_OBJ_UID'] ]; $newGuid = $map[ $val['OP_OBJ_UID'] ];
$oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid; $oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid;
} }
} }
}
foreach ( $oData->stepSupervisor as $key => $val ) { foreach ( $oData->stepSupervisor as $key => $val ) {
if ( $val['STEP_TYPE_OBJ'] == 'INPUT_DOCUMENT' ) { if ( $val['STEP_TYPE_OBJ'] == 'INPUT_DOCUMENT' ) {
$newGuid = $map[ $val['STEP_UID_OBJ'] ]; $newGuid = $map[ $val['STEP_UID_OBJ'] ];