diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index 0e0bafb31..7ff7fb878 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -333,7 +333,7 @@ class WebApplication //if (! class_exists($namespace)) { require_once $classFile; //} - //echo "****".$namespace."
"; + $this->rest->addAPIClass($namespace); } } diff --git a/workflow/engine/classes/class.feature.php b/workflow/engine/classes/class.feature.php index 93f23c3d7..ac30b160a 100644 --- a/workflow/engine/classes/class.feature.php +++ b/workflow/engine/classes/class.feature.php @@ -1,4 +1,5 @@ enableRestService($this->sNamespace, $enable); } } + /*----------------------------------********---------------------------------*/ \ No newline at end of file diff --git a/workflow/engine/classes/class.featureRegistry.php b/workflow/engine/classes/class.featureRegistry.php index f2bbb08e8..fb6eaeec5 100755 --- a/workflow/engine/classes/class.featureRegistry.php +++ b/workflow/engine/classes/class.featureRegistry.php @@ -1,5 +1,5 @@ getDynaFormCriteria(); - $rsCriteria = \DynaformPeer::doSelectRS($criteria); - $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); - While ($rsCriteria->next()) { - $row = $rsCriteria->getRow(); - } - //Return - return $this->getDynaFormDataFromRecord($row); - } catch (\Exception $e) { - throw $e; - } - } - /** * Get data of a DynaForm * diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Process.php b/workflow/engine/src/ProcessMaker/Services/Api/Process.php index 074963f89..d8070507d 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Process.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Process.php @@ -163,51 +163,6 @@ class Process extends Api return $response; } - - /** - * @url GET /:processUid/activity/:activityUid/feature-configuration - */ - public function getActivityFeatures($activityUid, $processUid) - { - $response = array(); - - try { - $task1 = new \Task(); - $task2 = new \ProcessMaker\BusinessModel\Task(); - - $arrayData = $task1->load($activityUid); - - $arrayData = array( - //"tas_uid" => $activityUid, - "tas_title" => $arrayData["TAS_TITLE"], - "tas_description" => $arrayData["TAS_DESCRIPTION"], - "tas_posx" => $arrayData["TAS_POSX"], - "tas_posy" => $arrayData["TAS_POSY"], - "tas_start" => $arrayData["TAS_START"], - "_extended" => array( - "properties" => $task2->getProperties($activityUid, true), - "steps" => array( - "steps" => $task2->getSteps($activityUid, true), - "conditions" => "...", //lo mismo que steps //$task->getSteps() - "triggers" => $task2->getTriggers($activityUid, true), - "users" => $task2->getUsers($activityUid, 1, true), - "users_adhoc" => $task2->getUsers($activityUid, 2, true) - ) - ) - ); - - //Response - $response["success"] = true; - $response["message"] = "Properties loaded successfully"; - $response["data"] = array("activity" => $arrayData); - } catch (\Exception $e) { - //Response - $response["success"] = false; - $response["message"] = $e->getMessage(); - } - - return $response; - } /** * @url GET /:processUid/activity/:activityUid/properties diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php index a30f1aee7..951780211 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php @@ -60,6 +60,7 @@ class Activity extends Api } } +/*----------------------------------********---------------------------------*/ /** * @param string $pro_uid {@min 32} {@max 32} * @param string $tas_uid {@min 32} {@max 32} @@ -86,7 +87,8 @@ class Activity extends Api throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } - +/*----------------------------------********---------------------------------*/ + /** * @param string $prj_uid {@min 32} {@max 32} * @param string $act_uid {@min 32} {@max 32} @@ -106,10 +108,11 @@ class Activity extends Api } $task = new \ProcessMaker\BusinessModel\Task(); $properties = $task->updateProperties($prj_uid, $act_uid, $request_data); - /** features */ + + /*----------------------------------********---------------------------------*/ $featureHandler = new \Features\FeaturesHandler(); $featureHandler->saveConfiguration($request_data['properties']['_features']); - /** features */ + /*----------------------------------********---------------------------------*/ } catch (\Exception $e) { throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } diff --git a/workflow/public_html/app.php b/workflow/public_html/app.php index b2c837b49..27dea5535 100644 --- a/workflow/public_html/app.php +++ b/workflow/public_html/app.php @@ -28,8 +28,9 @@ try { ); } } - +/*----------------------------------********---------------------------------*/ $loader->add($rootDir . 'workflow/engine/', 'Features'); +/*----------------------------------********---------------------------------*/ $loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker"); $loader->add($rootDir . 'workflow/engine/src/');