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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Fernando Ontiveros
2014-02-25 11:55:59 -05:00
parent 28da209694 333bfb774e
commit c3ac35fb6b
9 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/backend/files_manager/basic_sequence_files_manager.feature
View File

@@ -86,7 +86,7 @@ Feature: Files Manager Resources
#Para que funcione este test, debe existir el archivo que se quiere subir
Scenario: Post files
Given POST I want to upload the file "/home/daniel/test.txt" to path "public". Url to create prf_uid "project/1265557095225ff5c688f46031700471/file-manager" and updload "project/1265557095225ff5c688f46031700471/file-manager/upload"
Given POST I want to upload the file "/home/daniel/test.txt" to path "public". Url to create prf_uid "project/1265557095225ff5c688f46031700471/file-manager" and updload "project/1265557095225ff5c688f46031700471/file-manager"
Scenario: Delete file
Given that I want to delete a "public/test.txt"

2
features/backend/process_supervisor/main_tests_supervisor.feature
View File

@@ -209,7 +209,7 @@ Requirements:
Given POST this data:
"""
{
"dyn_uid": "<92562207752ceef36c7d874048012431>"
"dyn_uid": "92562207752ceef36c7d874048012431"
}
"""
And I request "project/85794888452ceeef3675164057928956/process-supervisor/dynaform"

14
features/bootstrap/RestContext.php
View File

@@ -1329,18 +1329,22 @@ class RestContext extends BehatContext
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$postUrl);
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_filename'=>$sfile, "prf_path" => $path, "prf_content" => ""));
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_filename'=>$sfile, "prf_path" => $path, "prf_content" => NULL));
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$postResult = curl_exec($ch);
curl_close($ch);
$aResult = explode(",",$postResult);
$aFileUid = explode(":",$aResult[0]);
$prfUid = trim(str_replace('"','',$aFileUid[1]));
$postResult = (array)json_decode($postResult);
if (sizeof($postResult) > 2) {
$prfUid = $postResult["prf_uid"];
} else {
var_dump($postResult["error"]);
}
$url = $url.$prfUid."/upload";
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$url);
curl_setopt($ch, CURLOPT_HTTPHEADER,$headr);
curl_setopt($ch, CURLOPT_POSTFIELDS, array('my_file'=>'@'.$prfFile, 'prf_uid' => $prfUid));
curl_setopt($ch, CURLOPT_POSTFIELDS, array('prf_file'=>'@'.$prfFile));
curl_setopt($ch, CURLOPT_USERAGENT,'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$postResult = curl_exec($ch);

18
workflow/engine/classes/model/BpmnFlow.php
View File

@@ -16,6 +16,24 @@ require_once 'classes/model/om/BaseBpmnFlow.php';
*/
class BpmnFlow extends BaseBpmnFlow
{
public static function removeAllRelated($elementUid)
{
$c = new Criteria('workflow');
$c1 = $c->getNewCriterion(BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $elementUid);
$c2 = $c->getNewCriterion(BpmnFlowPeer::FLO_ELEMENT_DEST, $elementUid);
$c1->addOr($c2);
$c->add($c1);
$flows = BpmnFlowPeer::doSelect($c);
foreach ($flows as $flow) {
$flow->delete();
}
}
/**
* @param $field string coming from \BpmnFlowPeer::<FIELD_NAME>
* @param $value string

3
workflow/engine/src/BusinessModel/FilesManager.php
View File

@@ -336,7 +336,8 @@ class FilesManager
'prf_type' => $oProcessFiles->getPrfType(),
'prf_editable' => $sEditable,
'prf_create_date' => $oProcessFiles->getPrfCreateDate(),
'prf_update_date' => $oProcessFiles->getPrfUpdateDate());
'prf_update_date' => $oProcessFiles->getPrfUpdateDate(),
'prf_content' => $content);
return $oProcessFile;
} catch (Exception $e) {
throw $e;

27
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -3,7 +3,6 @@ namespace ProcessMaker\Project\Adapter;
use ProcessMaker\Project;
use ProcessMaker\Util\Hash;
use Symfony\Component\DependencyInjection\Exception\LogicException;
/**
* Class BpmnWorkflow
@@ -149,6 +148,32 @@ class BpmnWorkflow extends Project\Bpmn
$this->wp->removeTask($actUid);
}
public function removeGateway($gatUid)
{
$gatewayData = $this->getGateway($gatUid);
$flowsDest = \BpmnFlow::findAllBy(\BpmnFlowPeer::FLO_ELEMENT_DEST, $gatUid);
foreach ($flowsDest as $flowDest) {
switch ($flowDest->getFloElementOriginType()) {
case "bpmnActivity":
$actUid = $flowDest->getFloElementOrigin();
$flowsOrigin = \BpmnFlow::findAllBy(\BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $gatUid);
foreach ($flowsOrigin as $flowOrigin) {
switch ($flowOrigin->getFloElementDestType()) {
case "bpmnActivity":
$toActUid = $flowOrigin->getFloElementDest();
$this->wp->removeRouteFromTo($actUid, $toActUid);
break;
}
}
break;
}
}
parent::removeGateway($gatUid);
}
// public function addFlow($data)
// {
// parent::addFlow($data);

3
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -500,6 +500,9 @@ class Bpmn extends Handler
$gateway = GatewayPeer::retrieveByPK($gatUid);
$gateway->delete();
// remove related object (flows)
Flow::removeAllRelated($gatUid);
self::log("Remove Gateway Success!");
} catch (\Exception $e) {
self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());

5
workflow/engine/src/Services/Api/ProcessMaker/Project/FilesManager.php
View File

@@ -143,7 +143,10 @@ class ProcessFilesManagerStructure
* @var string {@from body}
*/
public $prf_path;
/**
* @var string {@from body}
*/
public $prf_content;
}

6
workflow/engine/src/Tests/ProcessMaker/Project/Adapter/BpmnWorkflowTest.php
View File

@@ -21,7 +21,7 @@ class BpmnWorkflowTest extends \PHPUnit_Framework_TestCase
public static function tearDownAfterClass()
{
return false;
//return false;
//cleaning DB
foreach (self::$uids as $prjUid) {
$bwap = Project\Adapter\BpmnWorkflow::load($prjUid);
@@ -328,10 +328,10 @@ class BpmnWorkflowTest extends \PHPUnit_Framework_TestCase
// cleaning
$bwap->removeActivity($actUid1);
$bwap->removeActivity($actUid2);
$bwap->removeFlow($flowUid1);
$bwap->removeFlow($flowUid2);
$bwap->removeGateway($gatUid);
$this->assertCount(0, $bwap->getActivities());
$this->assertCount(0, $bwap->getGateways());
$this->assertCount(0, $bwap->getFlows());
$wp = Project\Workflow::load($bwap->getUid());