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

Merged in luisfernandosl/processmaker/HOR-436-C-3018 (pull request #3833)

Browse Source 
HOR-436-C "Notice</b>: Undefined variable..." SOLVED
This commit is contained in:
David Callizaya
2016-03-15 09:31:21 -04:00
parent aa438ad554 c83022afec
commit 0342e1336f
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

@@ -25,6 +25,7 @@
use \ProcessMaker\Importer\XmlImporter; use \ProcessMaker\Importer\XmlImporter;
ini_set("max_execution_time", 0); ini_set("max_execution_time", 0);
$affectedGroups = array();
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") && if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm5CeTJhQlIwN3IxMEkwaG4=") &&

3
workflow/engine/src/ProcessMaker/Importer/XmlImporter.php
View File

@@ -30,7 +30,8 @@ class XmlImporter extends Importer
throw new \Exception(\G::LoadTranslation("ID_INVALID_FILE")); throw new \Exception(\G::LoadTranslation("ID_INVALID_FILE"));
} }
$this->dom->load((is_null($filename))? $this->filename : $filename); $loadFilename = (is_null($filename))? $this->filename : $filename;
$this->dom->loadXml(file_get_contents($loadFilename));
$this->root = $this->dom->documentElement; $this->root = $this->dom->documentElement;
// validate version // validate version

3
workflow/engine/templates/processes/main.js
View File

@@ -1147,6 +1147,7 @@ importProcessExistGroup = function()
url : 'processes_Import_Ajax', url : 'processes_Import_Ajax',
waitMsg : _('ID_UPLOADING_PROCESS_FILE'), waitMsg : _('ID_UPLOADING_PROCESS_FILE'),
waitTitle : "&nbsp;", waitTitle : "&nbsp;",
timeout: 3600,
success : function(o, resp) { success : function(o, resp) {
var resp_ = Ext.util.JSON.decode(resp.response.responseText); var resp_ = Ext.util.JSON.decode(resp.response.responseText);
var sNewProUid = resp_.sNewProUid; var sNewProUid = resp_.sNewProUid;
@@ -1327,6 +1328,7 @@ importProcessExistProcess = function()
url : 'processes_Import_Ajax', url : 'processes_Import_Ajax',
waitMsg : _('ID_UPLOADING_PROCESS_FILE'), waitMsg : _('ID_UPLOADING_PROCESS_FILE'),
waitTitle : "&nbsp;", waitTitle : "&nbsp;",
timeout: 3600,
success: function(o, resp) { success: function(o, resp) {
var resp_ = Ext.util.JSON.decode(resp.response.responseText); var resp_ = Ext.util.JSON.decode(resp.response.responseText);
var sNewProUid = resp_.sNewProUid; var sNewProUid = resp_.sNewProUid;
@@ -1560,6 +1562,7 @@ importProcess = function()
url : "processes_Import_Ajax", url : "processes_Import_Ajax",
waitMsg : _("ID_UPLOADING_PROCESS_FILE"), waitMsg : _("ID_UPLOADING_PROCESS_FILE"),
waitTitle: "&nbsp;", waitTitle: "&nbsp;",
timeout: 3600,
success: function(o, resp) success: function(o, resp)
{ {
var resp_ = Ext.util.JSON.decode(resp.response.responseText); var resp_ = Ext.util.JSON.decode(resp.response.responseText);