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

Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-2639

Browse Source
This commit is contained in:
Paula Quispe
2017-02-13 16:19:27 -04:00
parent de675b2f62 dcd576f365
commit 9436d9ede4
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/class.derivation.php
View File

@@ -1211,6 +1211,19 @@ class Derivation
$this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex ); $this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex );
break; break;
default: default:
if ($nextDel['ROU_PREVIOUS_TYPE'] == 'SEC-JOIN') {
$criteria = new Criteria('workflow');
$criteria->clearSelectColumns();
$criteria->addSelectColumn(AppThreadPeer::APP_THREAD_PARENT);
$criteria->add(AppThreadPeer::APP_UID, $appFields['APP_UID']);
$criteria->add(AppThreadPeer::APP_THREAD_STATUS, 'OPEN');
$criteria->add(AppThreadPeer::APP_THREAD_INDEX, $iAppThreadIndex);
$rsCriteria = AppThreadPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) {
$this->case->closeAppThread($currentDelegation['APP_UID'], $iAppThreadIndex);
}
}
if ($currentDelegation['TAS_ASSIGN_TYPE'] == 'STATIC_MI' || $currentDelegation['TAS_ASSIGN_TYPE'] == 'CANCEL_MI') { if ($currentDelegation['TAS_ASSIGN_TYPE'] == 'STATIC_MI' || $currentDelegation['TAS_ASSIGN_TYPE'] == 'CANCEL_MI') {
$this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex ); $this->case->closeAppThread( $currentDelegation['APP_UID'], $iAppThreadIndex );
} }

14
workflow/engine/methods/setup/pluginsChange.php
View File

@@ -92,16 +92,12 @@ if ($handle = opendir( PATH_PLUGINS )) {
/** /**
* Calls PMExtensionClass Builder to include Plugins changes. * Calls PMExtensionClass Builder to include Plugins changes.
*/ */
$config = Bootstrap::getSystemConfiguration(); $phpBuilder = new ProcessMakerPhpBuilderHelper();
$phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
if (!empty($config['experimental_features'])) { if (!empty($phpBuilder->enabledExtensions)) {
$phpBuilder = new ProcessMakerPhpBuilderHelper(); $phpBuilder->extension = true;
$phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
if (!empty($phpBuilder->enabledExtensions)) {
$phpBuilder->extension = true;
}
$phpBuilder->buildAll();
} }
$phpBuilder->buildAll();
} }
//$oPluginRegistry->showArrays(); //$oPluginRegistry->showArrays();