fernando/luos
1
0
Fork 0
Code Releases Activity

ProcessMaker-MA "Project Properties - Step Resources (behat)"

Browse Source 
- Se han implementado los siguientes features:
    GET    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/steps
    GET    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/available-steps
    GET    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}
    POST   /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step
    PUT    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}
    DELETE /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}

    GET    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/triggers
    GET    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/available-triggers/{type}
    GET    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/trigger/{tri_uid}/{type}
    POST   /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/trigger
    PUT    /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/trigger/{tri_uid}
    DELETE /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/trigger/{tri_uid}/{type}

    Nota.- El endpoint:
               GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/trigger/{tri_uid}/{type}
           originalmente era:
               GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/step/{step_uid}/trigger/{tri_uid}

           Se cambio esto, ya que se debe indicar de donde se obtendra el trigger (BEFORE o AFTER), tambien
           se cambio el formato de respuesta para este endpoint, pues habia una incoherencia

           Todos estos cambios estan en el documento word
This commit is contained in:
Victor Saisa Lopez
2014-01-09 11:59:42 -04:00
parent c95806d5ab
commit b7873148ef
5 changed files with 377 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/BusinessModel/Step.php
View File

@@ -465,9 +465,11 @@ class Step
public function getTriggers($stepUid)
{
try {
//Get data
$arrayTrigger = array();
$trigger = new \BusinessModel\Trigger();
$bmTrigger = new \BusinessModel\Trigger();
$bmStepTrigger = new \BusinessModel\Step\Trigger();
$arrayDataUid = $this->getDataUids($stepUid);
@@ -508,8 +510,9 @@ class Step
$stepTrigger->orderPosition($stepUid, $taskUid, $type);
//Criteria
$criteria = $trigger->getTriggerCriteria();
$criteria = $bmTrigger->getTriggerCriteria();
$criteria->addSelectColumn(\StepTriggerPeer::ST_TYPE);
$criteria->addSelectColumn(\StepTriggerPeer::ST_CONDITION);
$criteria->addSelectColumn(\StepTriggerPeer::ST_POSITION);
$criteria->addJoin(\StepTriggerPeer::TRI_UID, \TriggersPeer::TRI_UID, \Criteria::LEFT_JOIN);
@@ -524,14 +527,7 @@ class Step
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$arrayTrigger[] = array(
"tri_uid" => $row["TRI_UID"],
"tri_title" => $row["TRI_TITLE"],
"tri_description" => $row["TRI_DESCRIPTION"],
"st_type" => $triggerType,
"st_condition" => $row["ST_CONDITION"],
"st_position" => (int)($row["ST_POSITION"])
);
$arrayTrigger[] = $bmStepTrigger->getTriggerDataFromRecord($row);
}
}