diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php index a6a3c9e71..eea3d8232 100644 --- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php @@ -34,7 +34,7 @@ use \ResultSet as ResultSet; use \BpmnFlow; use \G; use ProcessMaker\Util\Common; -use ProcessMaker\Exception; +use \Exception; /** * Class Bpmn @@ -432,9 +432,8 @@ class Bpmn extends Handler if (isset($activity)) { $activity->delete(); BpmnFlow::removeAllRelated($actUid); - } else { - throw new \Exception(G::LoadTranslation("ID_ACTIVITY_DOES_NOT_EXIST", array("act_uid", $actUid))); + throw new Exception(G::LoadTranslation("ID_ACTIVITY_DOES_NOT_EXIST", array("act_uid", $actUid))); } self::log("Remove Activity Success!"); } catch (\Exception $e) { diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php index 43e7631a9..05c288ebd 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php @@ -3,6 +3,9 @@ namespace ProcessMaker\Services\Api\Project; use \ProcessMaker\Services\Api; use \Luracast\Restler\RestException; +use ProcessMaker\Project\Adapter\BpmnWorkflow; +use ProcessMaker\BusinessModel\Task; +use \Exception; /** * Project\Activity Api Controller @@ -147,19 +150,19 @@ class Activity extends Api public function doDeleteProjectActivity($prj_uid, $act_uid) { try { - $task = new \ProcessMaker\BusinessModel\Task(); + $task = new Task(); $task->setFormatFieldNameInUppercase(false); $task->setArrayParamException(array("taskUid" => "act_uid")); $response = $task->hasPendingCases(array("act_uid" => $act_uid, "case_type" => "assigned")); if ($response->result !== false) { - $project = new \ProcessMaker\Project\Adapter\BpmnWorkflow(); + $project = new BpmnWorkflow(); $prj = $project->load($prj_uid); $prj->removeActivity($act_uid); } else { throw new RestException(403, $response->message); } - } catch (\Exception $e) { + } catch (Exception $e) { $resCode = $e->getCode() == 0 ? Api::STAT_APP_EXCEPTION : $e->getCode(); throw new RestException($resCode, $e->getMessage()); }