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

Merged in cochalo/processmaker (pull request #290)

Browse Source 
correccion en TRIGGERS y PERMISSIONS
This commit is contained in:
erik ao
2014-03-12 10:47:47 -04:00
parent 67352b5253 75bd0ae47e
commit 716fcd5cc9
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/src/BusinessModel/ProcessPermissions.php
View File

@@ -232,15 +232,21 @@ class ProcessPermissions
$sObjectUID = ''; $sObjectUID = '';
break; break;
case 'DYNAFORM': case 'DYNAFORM':
$this->validateDynUid($data['DYNAFORMS']); if ($data['DYNAFORMS'] != '') {
$this->validateDynUid($data['DYNAFORMS']);
}
$sObjectUID = $data['DYNAFORMS']; $sObjectUID = $data['DYNAFORMS'];
break; break;
case 'INPUT': case 'INPUT':
$this->validateInpUid($data['INPUTS']); if ($data['INPUTS'] != '') {
$this->validateInpUid($data['INPUTS']);
}
$sObjectUID = $data['INPUTS']; $sObjectUID = $data['INPUTS'];
break; break;
case 'OUTPUT': case 'OUTPUT':
$this->validateOutUid($data['OUTPUTS']); if ($data['OUTPUTS'] != '') {
$this->validateOutUid($data['OUTPUTS']);
}
$sObjectUID = $data['OUTPUTS']; $sObjectUID = $data['OUTPUTS'];
break; break;
} }

22
workflow/engine/src/BusinessModel/Trigger.php
View File

@@ -120,7 +120,27 @@ class Trigger
public function deleteTrigger($sTriggerUID = '') public function deleteTrigger($sTriggerUID = '')
{ {
$oTrigger = new \Triggers(); $oTrigger = new \Triggers();
$triggerObj = $oTrigger->load( $sTriggerUID ); $oTrigger->load( $sTriggerUID );
$res = $oTrigger->verifyDependecies($sTriggerUID);
$messageEnd = '';
if ($res->code != 0) {
foreach ($res->dependencies as $Object => $aDeps) {
$nDeps = count( $aDeps );
$message = str_replace( '{N}', $nDeps, \G::LoadTranslation( 'ID_TRIGGERS_VALIDATION_ERR2' ) );
$message = str_replace( '{Object}', $Object, $message );
$messageEnd .= $message . "\n";
foreach ($aDeps as $dep) {
if (substr( $Object, - 1 ) == 's') {
$Object = substr( $Object, 0, strlen( $Object ) - 1 );
}
$message = str_replace( '{Object}', $Object, \G::LoadTranslation( 'ID_TRIGGERS_VALIDATION_ERR3' ) );
$message = str_replace( '{Description}', '"' . $dep['DESCRIPTION'] . '"', $message );
$messageEnd .= $message . "\n";
}
$messageEnd .= "\n";
}
throw new \Exception($messageEnd);
}
$oTrigger->remove( $sTriggerUID ); $oTrigger->remove( $sTriggerUID );
$oStepTrigger = new \StepTrigger(); $oStepTrigger = new \StepTrigger();