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

Adding installer compiler tags for the enterprise version of processmaker take 2

Browse Source
This commit is contained in:
Gustavo Cruz
2015-03-06 10:05:03 -04:00
parent 0567a58f23
commit 280e1326e2
8 changed files with 16 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/Maveriks/WebApplication.php
View File

@@ -333,7 +333,7 @@ class WebApplication
//if (! class_exists($namespace)) {
require_once $classFile;
//}
//echo "****".$namespace."<br>";
$this->rest->addAPIClass($namespace);
}
}

2
workflow/engine/classes/class.feature.php
View File

@@ -1,4 +1,5 @@
<?php
/*----------------------------------********---------------------------------*/
/**
* class.feature.php
* @package workflow.engine.classes
@@ -375,3 +376,4 @@ class PMFeature
$oPluginRegistry->enableRestService($this->sNamespace, $enable);
}
}
/*----------------------------------********---------------------------------*/

4
workflow/engine/classes/class.featureRegistry.php
View File

@@ -1,5 +1,5 @@
<?php
/*----------------------------------********---------------------------------*/
/**
* class.featureRegistry.php
*
@@ -169,4 +169,4 @@ class PMFeatureRegistry
}
}
/*----------------------------------********---------------------------------*/

2
workflow/engine/methods/services/ActionsByEmail.php
View File

@@ -1,4 +1,5 @@
<?php
/*----------------------------------********---------------------------------*/
switch ($_REQUEST['action']) {
case 'processABE' :
$G_PUBLISH = new Publisher();
@@ -111,3 +112,4 @@ switch ($_REQUEST['action']) {
break;
}
/*----------------------------------********---------------------------------*/

24
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
View File

@@ -1012,30 +1012,6 @@ class DynaForm
}
}
/**
* Get a list of DynaForms
*
* @param string $dynaFormUid Unique id of DynaForm
*
* return array Return an array with data of a DynaForm
*/
public function getDynaFormList()
{
try {
//Get data
$criteria = $this->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
*

45
workflow/engine/src/ProcessMaker/Services/Api/Process.php
View File

@@ -164,51 +164,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
*/

7
workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
View File

@@ -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,6 +87,7 @@ class Activity extends Api
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
}
/*----------------------------------********---------------------------------*/
/**
* @param string $prj_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());
}

3
workflow/public_html/app.php
View File

@@ -28,8 +28,9 @@ try {
);
}
}
/*----------------------------------********---------------------------------*/
$loader->add($rootDir . 'workflow/engine/', 'Features');
/*----------------------------------********---------------------------------*/
$loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker");
$loader->add($rootDir . 'workflow/engine/src/');