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

Merged in release/3.4.4 (pull request #7197)

Browse Source 
3.4.4: Update the feature with the last official build

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2019-12-20 14:02:38 +00:00
parent 8a54785b52 3d9bc16480
commit 1008ee1ee3
47 changed files with 411 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/Cases.php
View File

@@ -797,7 +797,7 @@ class Cases
public function array_key_intersect(&$a, &$b)
{
$array = array();
while (list($key, $value) = each($a)) {
foreach ($a as $key => $value) {
if (isset($b[$key])) {
if (is_object($b[$key]) && is_object($value)) {
if (serialize($b[$key]) === serialize($value)) {
@@ -1034,6 +1034,7 @@ class Cases
public function removeCase($sAppUid, $deleteDelegation = true)
{
try {
$appUidCopy = $sAppUid;
$this->getExecuteTriggerProcess($sAppUid, 'DELETED');
$oAppDocument = new AppDocument();
@@ -1152,7 +1153,7 @@ class Cases
/** ProcessMaker log*/
$context = Bootstrap::getDefaultContextLog();
$context['appUid'] = $sAppUid;
$context['appUid'] = $appUidCopy;
$context['request'] = $nameFiles;
Bootstrap::registerMonolog('DeleteCases', 200, 'Delete Case', $context);

16
workflow/engine/classes/PmTable.php
View File

@@ -466,7 +466,7 @@ class PmTable
}
if (empty($line)) {
continue;
break;
}
if (strpos($line, "#") === 0) {
@@ -474,7 +474,7 @@ class PmTable
}
if (empty($line)) {
continue;
break;
}
// Concatenate the previous line, if any, with the current
@@ -487,7 +487,7 @@ class PmTable
// with the next one, thus supporting multi-line statements.
if (strrpos($line, ";") != strlen($line) - 1) {
$previous = $line;
continue;
break;
}
$line = substr($line, 0, strrpos($line, ";"));
@@ -513,7 +513,7 @@ class PmTable
}
if (empty($line)) {
continue;
break;
}
if (strpos($line, "#") === 0) {
@@ -521,7 +521,7 @@ class PmTable
}
if (empty($line)) {
continue;
break;
}
// Concatenate the previous line, if any, with the current
@@ -534,13 +534,13 @@ class PmTable
// with the next one, thus supporting multi-line statements.
if (strrpos($line, ";") != strlen($line) - 1) {
$previous = $line;
continue;
break;
}
$line = substr($line, 0, strrpos($line, ";"));
if (strpos($line, $this->tableName) == false) {
continue;
break;
}
$auxCreate = explode('CREATE', $line);
@@ -553,7 +553,7 @@ class PmTable
case 'oracle':
$line = trim($line); // Remove comments from the script
if (empty($line)) {
continue;
break;
}
switch (true) {
case preg_match("/^CREATE TABLE\s/i", $line):

10
workflow/engine/classes/ProcessMap.php
View File

@@ -729,6 +729,7 @@ class ProcessMap
$urlEdit = '';
$linkEditValue = '';
$shouldItContinue = false;
switch ($aRow['STEP_TYPE_OBJ']) {
case 'DYNAFORM':
$oDynaform = new Dynaform();
@@ -748,7 +749,8 @@ class ProcessMap
$oInputDocument = new InputDocument();
$aFields = $oInputDocument->getByUid($aRow['STEP_UID_OBJ']);
if ($aFields === false) {
continue;
$shouldItContinue = true;
break;
}
$sTitle = $aFields['INP_DOC_TITLE'];
break;
@@ -757,7 +759,8 @@ class ProcessMap
$aFields = $oOutputDocument->getByUid($aRow['STEP_UID_OBJ']);
if ($aFields === false) {
continue;
$shouldItContinue = true;
break;
}
$sTitle = $aFields['OUT_DOC_TITLE'];
break;
@@ -777,6 +780,9 @@ class ProcessMap
}
break;
}
if ($shouldItContinue === true) {
continue;
}
$aSteps[] = array('STEP_TITLE' => $sTitle, 'STEP_UID' => $aRow['STEP_UID'], 'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'], 'STEP_MODE' => $aRow['STEP_MODE'], 'STEP_CONDITION' => $aRow['STEP_CONDITION'], 'STEP_POSITION' => $aRow['STEP_POSITION'], 'urlEdit' => $urlEdit, 'linkEditValue' => $linkEditValue, 'PRO_UID' => $aRow['PRO_UID']
);

6
workflow/engine/classes/class.pmScript.php
View File

@@ -2,15 +2,15 @@
use ProcessMaker\Plugins\PluginRegistry;
function __autoload($sClassName)
{
spl_autoload_register(function($sClassName) {
if (!empty(config("system.workspace"))) {
$sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
if (file_exists($sPath . $sClassName . '.php')) {
require_once $sPath . $sClassName . '.php';
}
}
}
});
if (!empty(config("system.workspace")) && (!defined('PATH_DATA_SITE') || !defined('PATH_WORKSPACE'))) {
Bootstrap::setConstantsRelatedWs(config("system.workspace"));
}

2
workflow/engine/classes/model/Configuration.php
View File

@@ -103,7 +103,7 @@ class Configuration extends BaseConfiguration
public function exists($CfgUid, $ObjUid = "", $ProUid = "", $UsrUid = "", $AppUid = "")
{
$oRow = ConfigurationPeer::retrieveByPK( $CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid );
return (( get_class ($oRow) == 'Configuration' )&&(!is_null($oRow)));
return (!is_null($oRow) && get_class($oRow) === 'Configuration');
}
public function getAll ()

2
workflow/engine/classes/model/Translation.php
View File

@@ -237,7 +237,7 @@ class Translation extends BaseTranslation
}
$res['cacheFileMafe'] = $cacheFileMafe;
$res['languague'] = count($cacheFileMafe);
$res['languague'] = (is_array($cacheFileMafe) || $cacheFileMafe instanceof Countable) ? count($cacheFileMafe) : 0;
$res['rowsMafeJS'] = count( $translation );
return $res;
} catch (Exception $e) {