From 99540c4de0622aaa3d28ba517e42c56746a5cd54 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 14 Feb 2017 09:35:46 -0400 Subject: [PATCH] HOR-2577 --- workflow/engine/classes/class.processes.php | 17 +++++++++++++++-- .../methods/processes/processes_Import_Ajax.php | 4 ++-- workflow/engine/templates/processes/main.js | 4 +++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index 427b0c426..6e97a37b2 100644 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -2201,7 +2201,7 @@ class Processes foreach (array("PRO_TRI_DELETED", "PRO_TRI_CANCELED", "PRO_TRI_PAUSED", "PRO_TRI_REASSIGNED") as $value) { $key = $value; - if (isset($map[$oData->process[$key]])) { + if (isset($oData->process[$key]) && isset($map[$oData->process[$key]])) { $oData->process[$key] = $map[$oData->process[$key]]; } } @@ -5071,9 +5071,22 @@ class Processes $fileContent = fread($fp, $fsContent); //reading string $XmlContent $newFileName = $pathMailTem . $sFileName; $bytesSaved = @file_put_contents($newFileName, $fileContent); - if ($bytesSaved != $fsContent) { + if($bytesSaved === false){ throw (new Exception('Error writing MailTemplate file in directory : ' . $pathMailTem)); } + if ($bytesSaved != $fsContent) { + $channel = "writingMailTemplate"; + $context = \Bootstrap::getDefaultContextLog(); + $context['action'] = $channel; + if (defined("SYS_CURRENT_URI") && defined("SYS_CURRENT_PARMS")) { + $context['url'] = SYS_CURRENT_URI . '?' . SYS_CURRENT_PARMS; + } + $context['usrUid'] = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''; + $sysSys = defined("SYS_SYS") ? SYS_SYS : "Undefined"; + $message = 'The imported template has a number of byes different than the original template, please verify if the file \'' . $newFileName . '\' is correct.'; + $level = 400; + Bootstrap::registerMonolog($channel, $level, $message, $context, $sysSys, 'processmaker.log'); + } } } } diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 64386742a..f5b4aae9f 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -498,7 +498,7 @@ if ($action == "uploadFileNewProcess") { $affectedGroups = implode(', ', $affectedGroups); } } - $result->affectedGroups = $affectedGroups; + $result->affectedGroups = empty($affectedGroups) ? "" : $affectedGroups; //Add Audit Log $process = new Process(); @@ -641,7 +641,7 @@ if ($action == "uploadFileNewProcessExist") { $affectedGroups = implode(', ', $affectedGroups); } } - $result->affectedGroups = $affectedGroups; + $result->affectedGroups = empty($affectedGroups) ? "" : $affectedGroups; //!data ouput } catch (Exception $e) { diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 66765f905..d5630ec97 100644 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -1636,7 +1636,9 @@ importProcessExistGroup = function() } else { Ext.getCmp('objectsToImport').setValue(""); Ext.getCmp('importProcessExistGroupWindow').close(); - Ext.getCmp('importProcessExistProcessWindow').close(); + if (Ext.getCmp('importProcessExistProcessWindow')) { + Ext.getCmp('importProcessExistProcessWindow').close(); + } Ext.getCmp('importProcessWindow').close(); Ext.MessageBox.show({ title: _('ID_ERROR'),