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

Merged in release/3.4.8 (pull request #7282)

Browse Source 
PMCORE-1196

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2020-03-11 13:36:55 +00:00
committed by Julio Cesar Laura Avendaño
parent 28d1ba858b d1c8d49bd0
commit 34c1e69c32
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
thirdparty/propel/Propel.php vendored
View File

@@ -601,7 +601,9 @@ class Propel
foreach (self::$connectionMap as $cnn) {
if (get_class($cnn) != "DBArrayConnection") {
if (isset($cnn->lastQuery)) {
if (gettype($cnn->getResource()) == "resource" && $cnn->isConnected() && $cnn->lastQuery != $lastQuery) {
$existsIsConnectedMethod = method_exists($cnn, "isConnected");
$existsCloseMethod = method_exists($cnn, "close");
if ($existsIsConnectedMethod && $existsCloseMethod && $cnn->isConnected() && $cnn->lastQuery != $lastQuery) {
$cnn->close();
}
$lastQuery = $cnn->lastQuery;

10
workflow/engine/src/ProcessMaker/Core/JobsManager.php
View File

@@ -2,6 +2,7 @@
namespace ProcessMaker\Core;
use Bootstrap;
use Exception;
use Illuminate\Support\Facades\Log;
use ProcessMaker\BusinessModel\Factories\Jobs;
@@ -140,12 +141,14 @@ class JobsManager
$_SESSION = $environment['session'];
$_SERVER = $environment['server'];
Propel::initConfiguration($environment['configuration']);
foreach ($environment['constants'] as $key => $value) {
if (!defined($key)) {
define($key, $value);
}
}
Propel::close();
Propel::init(PATH_CONFIG . "databases.php");
}
/**
@@ -190,6 +193,11 @@ class JobsManager
$callback($environment);
} catch (Exception $e) {
Log::error($e->getMessage() . ": " . $e->getTraceAsString());
$context = [
"trace" => $e->getTraceAsString(),
"workspace" => $environment["constants"]["SYS_SYS"]
];
Bootstrap::registerMonolog("queue:work", 400, $e->getMessage(), $context, "");
throw $e;
}
});

3
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -534,9 +534,10 @@ class Delegation extends Model
$selfServiceTasks = TaskUser::getSelfServicePerUser($usrUid);
if (!empty($selfServiceTasks)) {
// Start the first query
// Start the second query
$query2 = Delegation::query()->select('APP_NUMBER');
$query2->tasksIn($selfServiceTasks);
$query2->isThreadOpen();
$query2->noUserInThread();
// Build the complex query that uses "UNION DISTINCT" clause

19
workflow/engine/templates/cases/open.js
View File

@@ -1079,15 +1079,24 @@ Ext.onReady(function(){
try {
var data = Ext.util.JSON.decode(result.responseText);
if (data.status == true) {
// The case was cancelled
parent.notify('', _("ID_CASE_CANCELLED", stringReplace("\\: ", "", _APP_NUM)));
if (!isBrowserIE()) {
// The case was cancelled
parent.notify('', _("ID_CASE_CANCELLED", stringReplace("\\: ", "", _APP_NUM)));
}
} else {
// The case wasn't cancel
parent.notify('', data.msg);
if (!isBrowserIE()) {
// The case wasn't cancel
parent.notify('', data.msg);
}
}
parent.updateCasesTree();
} catch (e) {
parent.notify('', _('ID_SOMETHING_WRONG'));
if (isBrowserIE()) {
Ext.MessageBox.alert(_('ID_FAILED'), _('ID_SOMETHING_WRONG'));
} else {
parent.notify('', _('ID_SOMETHING_WRONG'));
}
}
location.href = 'casesListExtJs';
},