fernando/luos
1
0
Fork 0
Code Releases Activity

change

Browse Source
This commit is contained in:
Ronald Quenta
2017-08-01 12:16:06 -04:00
parent 6cdb07c2c8
commit cc5fcb08bc
116 changed files with 4797 additions and 3202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
<?php
namespace ProcessMaker\Project\Adapter;
use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Project;
use ProcessMaker\Util;
@@ -226,7 +227,7 @@ class BpmnWorkflow extends Project\Bpmn
$taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
break;
case 'SERVICETASK':
$registry = \PMPluginRegistry::getSingleton();
$registry = PluginRegistry::loadSingleton();
$taskData["TAS_TYPE"] = "NORMAL";
//The plugin pmConnectors will be moved to the core in pm.3.3
if ($registry->getStatusPlugin('pmConnectors') === 'enabled') {
@@ -306,7 +307,7 @@ class BpmnWorkflow extends Project\Bpmn
*/
public function sincronizeActivityData($actUid, $data)
{
$registry = \PMPluginRegistry::getSingleton();
$registry = PluginRegistry::loadSingleton();
$taskData = \TaskPeer::retrieveByPK($actUid);
//The plugin pmConnectors will be moved to the core in pm.3.3
if ($taskData->getTasType() == 'SERVICE-TASK' && $registry->getStatusPlugin('pmConnectors') !== 'enabled') {
@@ -325,7 +326,7 @@ class BpmnWorkflow extends Project\Bpmn
*/
static function __updateServiceTask($activityBefore, $activityCurrent, $taskData)
{
$registry = \PMPluginRegistry::getSingleton();
$registry = PluginRegistry::loadSingleton();
if ($activityBefore->getActTaskType() != "SERVICETASK" && $activityCurrent->getActTaskType() == "SERVICETASK") {
//The plugin pmConnectors will be moved to the core in pm.3.3
if ($registry->getStatusPlugin('pmConnectors') === 'enabled') {

5
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -2,6 +2,7 @@
namespace ProcessMaker\Project;
use \Criteria;
use ProcessMaker\Plugins\PluginRegistry;
use \ResultSet;
use \Process;
@@ -87,7 +88,7 @@ class Workflow extends Handler
$pluginData['PRO_TEMPLATE'] = empty($data["PRO_TEMPLATE"]) ? "" : $data["PRO_TEMPLATE"];
$pluginData['PROCESSMAP'] = null;
$pluginRegistry = \PMPluginRegistry::getSingleton();
$pluginRegistry = PluginRegistry::loadSingleton();
$pluginRegistry->executeTriggers(PM_NEW_PROCESS_SAVE, $pluginData);
// Save Calendar ID for this process
@@ -230,7 +231,7 @@ class Workflow extends Handler
}
if ($tasType == "SERVICE-TASK") {
$registry = \PMPluginRegistry::getSingleton();
$registry = PluginRegistry::loadSingleton();
//The plugin pmConnectors will be moved to the core in pm.3.3
if ($registry->getStatusPlugin('pmConnectors') === 'enabled') {
$pathFile = PATH_PLUGINS . 'pmConnectors' . PATH_SEP . 'src' . PATH_SEP . 'Services' . PATH_SEP . 'BusinessModel' . PATH_SEP . 'PmConnectors' . PATH_SEP . 'ServiceTaskBM.php';