diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index 34b13941f..ba90062b4 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -95,14 +95,12 @@ class Task { try { $prj_uid = $this->validateProUid($prj_uid); - $act_uid = $this->validateActUid($prj_uid, $act_uid); + $taskUid = $this->validateActUid($act_uid); //G::LoadClass("configuration"); require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.configuration.php"); $task = new \Task(); - - $this->validateActUid($taskUid); $arrayDataAux = $task->load($taskUid); //$arrayDataAux["INDEX"] = 0; @@ -234,7 +232,7 @@ class Task $arrayProperty = array_change_key_case($arrayProperty['properties'], CASE_UPPER); } $prj_uid = $this->validateProUid($prj_uid); - $act_uid = $this->validateActUid($prj_uid, $act_uid); + $act_uid = $this->validateActUid($act_uid); $arrayProperty["TAS_UID"] = $act_uid; $arrayProperty["PRO_UID"] = $prj_uid; @@ -320,7 +318,7 @@ class Task { try { $prj_uid = $this->validateProUid($prj_uid); - $act_uid = $this->validateActUid($prj_uid, $act_uid); + $act_uid = $this->validateActUid($act_uid); G::LoadClass('tasks'); $tasks = new \Tasks(); @@ -1776,11 +1774,11 @@ class Task public function validateActUid($act_uid) { $act_uid = trim($act_uid); if ($act_uid == '') { - throw (new \Exception("The project with act_uid: '', does not exist.")); + throw (new \Exception("The activity with act_uid: '', does not exist.")); } $oTask = new \Task(); if (!($oTask->taskExists($act_uid))) { - throw (new \Exception("The project with act_uid: '$act_uid', does not exist.")); + throw (new \Exception("The activity with act_uid: '$act_uid', does not exist.")); } return $act_uid; } diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php index 746eeb9e6..40517e3c0 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php @@ -16,6 +16,10 @@ class Activity extends Api * @param string $act_uid {@min 32} {@max 32} * @param string $filter {@choice definition,,properties} * + * @author Brayan Pereyra (Cochalo) + * @copyright Colosa - Bolivia + * @return array + * * @url GET /:prj_uid/activity/:act_uid */ public function doGetProjectActivity($prj_uid, $act_uid, $filter = '') @@ -61,6 +65,10 @@ class Activity extends Api * @param string $act_uid {@min 32} {@max 32} * @param ActivityPropertiesStructure $properties {@from body} * + * @author Brayan Pereyra (Cochalo) + * @copyright Colosa - Bolivia + * @return array + * * @url PUT /:prj_uid/activity/:act_uid */ public function doPutProjectActivity($prj_uid, $act_uid, ActivityPropertiesStructure $properties, $request_data = array()) @@ -82,6 +90,10 @@ class Activity extends Api * @param string $prj_uid {@min 32} {@max 32} * @param string $act_uid {@min 32} {@max 32} * + * @author Brayan Pereyra (Cochalo) + * @copyright Colosa - Bolivia + * @return array + * * @url DELETE /:prj_uid/activity/:act_uid */ public function doDeleteProjectActivity($prj_uid, $act_uid)