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

Merged in release/3.2.4 (pull request #6557)

Browse Source 
HOR:4741: Update with 3.2.4

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-07-17 19:37:21 +00:00
committed by Julio Cesar Laura Avendaño
parent ad14fc7f0a adcbbbed97
commit a24e057b23
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/WsBase.php
View File

@@ -931,7 +931,7 @@ class WsBase
$cc, $cc,
$bcc, $bcc,
'', '',
'', $attachment,
'pending', 'pending',
($showMessage) ? 1 : 0, ($showMessage) ? 1 : 0,
$msgError, $msgError,

1
workflow/engine/src/ProcessMaker/Util/FixReferencePath.php
View File

@@ -125,7 +125,6 @@ class FixReferencePath
$pmTable->prepare(); $pmTable->prepare();
$pmTable->preparePropelIniFile(); $pmTable->preparePropelIniFile();
$pmTable->buildSchema(); $pmTable->buildSchema();
$pmTable->phingbuildModel();
$this->outVerboseln("* Regenerate classes for table: " . $row["ADD_TAB_NAME"]); $this->outVerboseln("* Regenerate classes for table: " . $row["ADD_TAB_NAME"]);
} catch (Exception $e) { } catch (Exception $e) {
CLI::logging(CLI::error("Error:" . "Error in regenerate classes for table: " . $row["ADD_TAB_NAME"] . ". " . $e)); CLI::logging(CLI::error("Error:" . "Error in regenerate classes for table: " . $row["ADD_TAB_NAME"] . ". " . $e));

5
workflow/engine/templates/admin/pmLogo.js
View File

@@ -245,6 +245,9 @@ Ext.onReady(function () {
buttonText: _('ID_SELECT_FILE'), buttonText: _('ID_SELECT_FILE'),
name: 'img', name: 'img',
validator: function (filePath) { validator: function (filePath) {
if (uploadWin.isVisible() === false) {
return true;
}
var flag, btn; var flag, btn;
btn = Ext.getCmp('btnUpload'); btn = Ext.getCmp('btnUpload');
btn.disable(); btn.disable();
@@ -295,9 +298,9 @@ Ext.onReady(function () {
PMExt.notify(_('ID_SUCCESS'), messageError); PMExt.notify(_('ID_SUCCESS'), messageError);
} }
uploadWin.hide();
panelRightTop.getForm().reset(); panelRightTop.getForm().reset();
store.load(); store.load();
uploadWin.hide();
} }
}); });
} }