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

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

@@ -2850,7 +2850,7 @@ class processMap {
// $tasks = new Tasks(); // $tasks = new Tasks();
// $tasks->get // $tasks->get
// $link = $sProcessUID.'/'.str_replace ( ' ', '_', str_replace ( '/', '_',$task_uid)); // $link = $sProcessUID.'/'.str_replace ( ' ', '_', str_replace ( '/', '_',$task_uid));
// //
// return $link; // return $link;
// } // }
@@ -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 = ''";
@@ -4590,7 +4610,7 @@ class processMap {
$task = new Task(); $task = new Task();
$task->load($task_uid); $task->load($task_uid);
$task_name = $task->getTasTitle(); $task_name = $task->getTasTitle();
if (G::is_https ()) if (G::is_https ())
$http = 'https://'; $http = 'https://';
@@ -5286,7 +5306,7 @@ class processMap {
} }
$result = array(); $result = array();
//Now count how many times the dynaform was used in different tasks in VIEW mode, //Now count how many times the dynaform was used in different tasks in VIEW mode,
$groupbyCriteria = new Criteria ( 'workflow' ); $groupbyCriteria = new Criteria ( 'workflow' );
$groupbyCriteria->clearSelectColumns(); $groupbyCriteria->clearSelectColumns();
$groupbyCriteria->addSelectColumn ( StepPeer::STEP_UID_OBJ ); $groupbyCriteria->addSelectColumn ( StepPeer::STEP_UID_OBJ );
@@ -5305,7 +5325,7 @@ class processMap {
$oDataset->next (); $oDataset->next ();
} }
//Now count how many times the dynaform was used in different tasks in EDIT mode, //Now count how many times the dynaform was used in different tasks in EDIT mode,
$groupbyCriteria = new Criteria ( 'workflow' ); $groupbyCriteria = new Criteria ( 'workflow' );
$groupbyCriteria->clearSelectColumns(); $groupbyCriteria->clearSelectColumns();
$groupbyCriteria->addSelectColumn ( StepPeer::STEP_UID_OBJ ); $groupbyCriteria->addSelectColumn ( StepPeer::STEP_UID_OBJ );
@@ -6632,7 +6652,7 @@ function saveExtddEvents($oData)
$sEvn_uid = $oEvent->create($aData); $sEvn_uid = $oEvent->create($aData);
}else{ }else{
$aData['EVN_UID'] = $sEvn_uid; $aData['EVN_UID'] = $sEvn_uid;
$oEvent->update($aData); $oEvent->update($aData);
} }
$oEncode->uid = $sEvn_uid; $oEncode->uid = $sEvn_uid;
$oJSON = new Services_JSON ( ); $oJSON = new Services_JSON ( );

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

@@ -756,8 +756,10 @@ 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' ) {
$newGuid = $map[ $val['OP_OBJ_UID'] ]; if(isset($map[ $val['OP_OBJ_UID'] ])){
$oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid; $newGuid = $map[ $val['OP_OBJ_UID'] ];
$oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid;
}
} }
} }
foreach ( $oData->stepSupervisor as $key => $val ) { foreach ( $oData->stepSupervisor as $key => $val ) {
@@ -1338,8 +1340,10 @@ 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' ) {
$newGuid = $map[ $val['OP_OBJ_UID'] ]; if(isset($map[ $val['OP_OBJ_UID'] ])){
$oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid; $newGuid = $map[ $val['OP_OBJ_UID'] ];
$oData->objectPermissions[$key]['OP_OBJ_UID'] = $newGuid;
}
} }
} }
foreach ( $oData->stepSupervisor as $key => $val ) { foreach ( $oData->stepSupervisor as $key => $val ) {