fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-03-12 12:26:11 -04:00
parent 7e95e5be67 850952607a
commit b7af89e00c
3 changed files with 31 additions and 5 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 = '';
break;
case 'DYNAFORM':
$this->validateDynUid($data['DYNAFORMS']);
if ($data['DYNAFORMS'] != '') {
$this->validateDynUid($data['DYNAFORMS']);
}
$sObjectUID = $data['DYNAFORMS'];
break;
case 'INPUT':
$this->validateInpUid($data['INPUTS']);
if ($data['INPUTS'] != '') {
$this->validateInpUid($data['INPUTS']);
}
$sObjectUID = $data['INPUTS'];
break;
case 'OUTPUT':
$this->validateOutUid($data['OUTPUTS']);
if ($data['OUTPUTS'] != '') {
$this->validateOutUid($data['OUTPUTS']);
}
$sObjectUID = $data['OUTPUTS'];
break;
}

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

@@ -120,7 +120,27 @@ class Trigger
public function deleteTrigger($sTriggerUID = '')
{
$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 );
$oStepTrigger = new \StepTrigger();

2
workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml
View File

@@ -46,7 +46,7 @@ function loadEditor()
}
else if(dynEditorType == 'processMap3')
{
window.location.href="@G::encryptLink(@#processMap3)?pro_uid=@%PRO_UID";
window.location.href="@G::encryptLink(@#processMap3)?prj_uid=@%PRO_UID";
return true;
}
else if(dynEditorType == 'bpmn')