From 42bf10789e825811e9f083ed4a5fe873036ade4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Thu, 5 Jul 2018 20:12:56 +0000 Subject: [PATCH 1/6] Merged in bugfix/HOR-4713 (pull request #6542) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HOR-4713 Approved-by: Julio Cesar Laura Avendaño Approved-by: Dante Loayza --- workflow/public_html/sysGeneric.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index d6042192a..9f27d05c4 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -37,6 +37,11 @@ function transactionLog($transactionName){ //Application base name newrelic_set_appname ($baseName); + //Initialize Laravel app if is not booted + if (!app()->isBooted()) { + app()->make(Kernel::class)->bootstrap(); + restore_error_handler(); + } //Custom parameters if(!empty(config("system.workspace"))){ From b578ba1e87bf4af50a7b66ef22f5ecf6b648287f Mon Sep 17 00:00:00 2001 From: Roly Date: Fri, 6 Jul 2018 19:29:51 +0000 Subject: [PATCH 2/6] Merged in bugfix/HOR-4716 (pull request #6544) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HOR-4716 Approved-by: Julio Cesar Laura Avendaño --- workflow/engine/src/ProcessMaker/Services/Api/Cases.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php index 96c89c39e..19a26aeda 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php @@ -984,8 +984,6 @@ class Cases extends Api * @class AccessControl {@permission PM_CASES} * @param string $cas_uid {@min 1}{@max 32} * @throws Exception - * - * @param string $cas_uid {@min 1}{@max 32} */ public function doDeleteCase($cas_uid) { From 2c5200d9f2d87e199d4f25b5a2fc1c3c26665d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Tue, 10 Jul 2018 19:54:41 +0000 Subject: [PATCH 3/6] Merged in bugfix/HOR-4697 (pull request #6548) HOR-4697 Approved-by: Paula Quispe Approved-by: Dante Loayza --- framework/src/Maveriks/WebApplication.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index accc6b8f3..fe9632e83 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -114,7 +114,9 @@ class WebApplication } else { return self::RUNNING_DEFAULT; } - } elseif (substr($this->requestUri, 1, 3) === "api" && count(explode("/", $this->requestUri)) >= 4 // url api pattern: /api/1.0// + } elseif ($this->requestUri !== "/api/oauth2/token" && + substr($this->requestUri, 1, 3) === "api" && + count(explode("/", $this->requestUri)) >= 4 // url api pattern: /api/1.0// ) { return self::RUNNING_API; } else { From 8b64b015006ebf5a8fef8e889104e0858494b9d7 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 11 Jul 2018 13:24:15 -0400 Subject: [PATCH 4/6] HOR-4732 --- workflow/engine/classes/WsBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php index 30fa93cdc..30122fd1c 100644 --- a/workflow/engine/classes/WsBase.php +++ b/workflow/engine/classes/WsBase.php @@ -889,7 +889,7 @@ class WsBase $cc, $bcc, '', - '', + $attachment, 'pending', ($showMessage) ? 1 : 0, $msgError, From d35f6f925f2d1518b032ee9bc3b7e5c831da0921 Mon Sep 17 00:00:00 2001 From: gustavo cruz Date: Fri, 13 Jul 2018 14:35:08 -0400 Subject: [PATCH 5/6] HOR-4735: Removing conflicting phingBuildModel call. --- workflow/engine/src/ProcessMaker/Util/FixReferencePath.php | 1 - 1 file changed, 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Util/FixReferencePath.php b/workflow/engine/src/ProcessMaker/Util/FixReferencePath.php index ce4614e5d..705f20afc 100644 --- a/workflow/engine/src/ProcessMaker/Util/FixReferencePath.php +++ b/workflow/engine/src/ProcessMaker/Util/FixReferencePath.php @@ -125,7 +125,6 @@ class FixReferencePath $pmTable->prepare(); $pmTable->preparePropelIniFile(); $pmTable->buildSchema(); - $pmTable->phingbuildModel(); $this->outVerboseln("* Regenerate classes for table: " . $row["ADD_TAB_NAME"]); } catch (Exception $e) { CLI::logging(CLI::error("Error:" . "Error in regenerate classes for table: " . $row["ADD_TAB_NAME"] . ". " . $e)); From 30480de5bede0bdca98c52b3893ce13b45c97ed6 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 17 Jul 2018 11:35:47 -0400 Subject: [PATCH 6/6] HOR-4739 --- workflow/engine/templates/admin/pmLogo.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/admin/pmLogo.js b/workflow/engine/templates/admin/pmLogo.js index acc07a616..1993cdf44 100644 --- a/workflow/engine/templates/admin/pmLogo.js +++ b/workflow/engine/templates/admin/pmLogo.js @@ -245,6 +245,9 @@ Ext.onReady(function () { buttonText: _('ID_SELECT_FILE'), name: 'img', validator: function (filePath) { + if (uploadWin.isVisible() === false) { + return true; + } var flag, btn; btn = Ext.getCmp('btnUpload'); btn.disable(); @@ -295,9 +298,9 @@ Ext.onReady(function () { PMExt.notify(_('ID_SUCCESS'), messageError); } + uploadWin.hide(); panelRightTop.getForm().reset(); store.load(); - uploadWin.hide(); } }); }