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

I replace the code with a function isBpmnProcess

Browse Source
This commit is contained in:
Paula V. Quispe
2015-02-13 16:30:11 -04:00
parent 3ac5fdf9ba
commit 0087164f0d
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/classes/class.derivation.php
View File

@@ -240,13 +240,12 @@ class Derivation
//1. There is no rule
if (count($arrayNextTask) == 0) {
$c = new Criteria("workflow");
$c->add(BpmnProcessPeer::PRJ_UID, $_SESSION['PROCESS']);
$res = BpmnProcessPeer::doSelect($c);
if( sizeof($res) == 0 ){
throw new Exception(G::LoadTranslation("ID_NO_DERIVATION_RULE"));
$oProcess = new Process();
$oProcessFieds = $oProcess->Load( $_SESSION['PROCESS'] );
if(isset($oProcessFieds['PRO_BPMN']) && $oProcessFieds['PRO_BPMN'] == 1){
throw new Exception(G::LoadTranslation("ID_NO_DERIVATION_BPMN_RULE"));
}else{
throw new Exception(G::LoadTranslation("ID_NO_DERIVATION_BPMN_RULE"));
throw new Exception(G::LoadTranslation("ID_NO_DERIVATION_RULE"));
}
}

13
workflow/engine/classes/model/Process.php
View File

@@ -326,6 +326,8 @@ class Process extends BaseProcess
}
$aFields['PRO_DYNAFORMS'] = @unserialize( $aFields['PRO_DYNAFORMS'] );
//Check if is BPMN process
$aFields['PRO_BPMN'] = $this->isBpmnProcess($ProUid);
return $aFields;
} else {
@@ -1009,5 +1011,16 @@ class Process extends BaseProcess
return 0;
}
}
public function isBpmnProcess($proUid){
$c = new Criteria("workflow");
$c->add(BpmnProcessPeer::PRJ_UID, $proUid);
$res = BpmnProcessPeer::doSelect($c);
if( sizeof($res) == 0 ){
return 0;
}else{
return 1;
}
}
}

11
workflow/engine/methods/cases/cases_Step.php
View File

@@ -1019,14 +1019,11 @@ try {
}
//Add content content step - End
} catch (Exception $e) {
//Check if the process is BPMN
$c = new Criteria("workflow");
$c->add(BpmnProcessPeer::PRJ_UID, $_SESSION['PROCESS']);
$res = BpmnProcessPeer::doSelect($c);
if( sizeof($res) == 0 ){
G::SendTemporalMessage( G::LoadTranslation( 'ID_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
//Check if the process is BPMN
if(isset($oProcessFieds['PRO_BPMN']) && $oProcessFieds['PRO_BPMN'] == 1){
G::SendTemporalMessage( G::LoadTranslation( 'ID_BPMN_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
}else{
G::SendTemporalMessage( G::LoadTranslation( 'ID_BPMN_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
G::SendTemporalMessage( G::LoadTranslation( 'ID_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
}
$aMessage = array ();