From 22239d3bd1559729723ca7e1a716494fec8f2d2d Mon Sep 17 00:00:00 2001 From: norahmollo Date: Tue, 3 Feb 2015 17:33:40 -0400 Subject: [PATCH 1/5] PM-1396 No es posible actualizar los calendarios. Se agrego una validacion para verificar diferencia entre nombres --- workflow/engine/controllers/adminProxy.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 4e21d091e..a6bd82469 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -178,6 +178,7 @@ class adminProxy extends HttpProxyController $message = ''; $oldName = isset($_POST['oldName'])? $_POST['oldName']:''; + switch ($_POST['action']){ case 'calendarName': require_once ('classes/model/CalendarDefinition.php'); @@ -191,11 +192,14 @@ class adminProxy extends HttpProxyController $message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); break; } + if (isset($aDefinitions['CALENDAR_NAME'])) { - if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) { - $validated = false; - $message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); - break; + if ($oldName != $_POST['name']) { + if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) { + $validated = false; + $message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); + break; + } } } } From 2613e8ba05d32508e3003d2d318352ed8433403a Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Wed, 4 Feb 2015 12:38:08 -0400 Subject: [PATCH 2/5] PM-1442 "Revisar el endpoint de los dependientes y verificar si existe el reemplazo de variables para los queries, si no existe implementarlo" SOLVED --- .../src/ProcessMaker/BusinessModel/Variable.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) mode change 100644 => 100755 workflow/engine/src/ProcessMaker/BusinessModel/Variable.php diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php old mode 100644 new mode 100755 index f73506687..f015af7f8 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php @@ -1,6 +1,8 @@ createStatement(); - $rs = $stmt->executeQuery(\G::replaceDataField($variableSql, $arrayVariable), \ResultSet::FETCHMODE_NUM); + $replaceFields = G::replaceDataField($variableSql, $arrayVariable); + + $rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM); while ($rs->next()) { $row = $rs->getRow(); @@ -661,8 +665,9 @@ class Variable $cnn = \Propel::getConnection(($variableDbConnectionUid . "" != "")? $variableDbConnectionUid : "workflow"); $stmt = $cnn->createStatement(); + $replaceFields = G::replaceDataField($sqlQuery, $arrayVariable); - $rs = $stmt->executeQuery(\G::replaceDataField($sqlQuery, $arrayVariable), \ResultSet::FETCHMODE_NUM); + $rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM); while ($rs->next()) { $row = $rs->getRow(); From ea2cb9384ba58324f4e29ffd5758bfeb8a279045 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Wed, 4 Feb 2015 14:00:50 -0400 Subject: [PATCH 3/5] PM-1396 No es posible actualizar los calendarios Se agrego validacion para verificar Id del calendario a modificar --- workflow/engine/controllers/adminProxy.php | 7 ++++--- workflow/engine/templates/admin/calendarEdit.js | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index a6bd82469..ac8f10492 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -177,7 +177,7 @@ class adminProxy extends HttpProxyController $httpData=array_unique((array)$httpData); $message = ''; $oldName = isset($_POST['oldName'])? $_POST['oldName']:''; - + $uid = isset($_POST['uid'])? $_POST['uid']:''; switch ($_POST['action']){ case 'calendarName': @@ -185,7 +185,7 @@ class adminProxy extends HttpProxyController $oCalendar = new CalendarDefinition(); $aCalendars = $oCalendar->getCalendarList(false,true); $aCalendarDefinitions = end($aCalendars); - + foreach ($aCalendarDefinitions as $aDefinitions) { if (trim($_POST['name'])=='') { $validated = false; @@ -194,7 +194,8 @@ class adminProxy extends HttpProxyController } if (isset($aDefinitions['CALENDAR_NAME'])) { - if ($oldName != $_POST['name']) { + + if ($aDefinitions['CALENDAR_UID'] != $uid) { if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) { $validated = false; $message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); diff --git a/workflow/engine/templates/admin/calendarEdit.js b/workflow/engine/templates/admin/calendarEdit.js index c4fc512b2..618a533ae 100644 --- a/workflow/engine/templates/admin/calendarEdit.js +++ b/workflow/engine/templates/admin/calendarEdit.js @@ -757,13 +757,13 @@ Ext.onReady( function() { Ext.getCmp('idInvalidCalendarName').hide(); var validateMessage = ''; var canlendarName = Ext.getCmp('dynaformCalendarName').getValue(); - Ext.Ajax.request( { url: '../adminProxy/calendarValidate', params: { action : 'calendarName', oldName : fields.OLD_NAME, - name : canlendarName + name : canlendarName, + uid : fields.CALENDAR_UID }, success: function(resp){ if (resp.responseText != '[]') From f577e3ee883a1375e707b2760490c6bc0b1c1ec0 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Wed, 4 Feb 2015 14:31:39 -0400 Subject: [PATCH 4/5] PM-1395 Se necesita que el campo: "From Mail" y habilitar "ServerEmailForDefault" para que se pueda enviar correos Modificacion de marcas para la version community --- workflow/engine/templates/emailServer/emailServer.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/workflow/engine/templates/emailServer/emailServer.js b/workflow/engine/templates/emailServer/emailServer.js index 4feabbe8e..b9cdd52ea 100644 --- a/workflow/engine/templates/emailServer/emailServer.js +++ b/workflow/engine/templates/emailServer/emailServer.js @@ -361,11 +361,9 @@ emailServer.application = { { if (flagPassChecked) { Ext.getCmp("txtPassword").setVisible(true); - Ext.getCmp("txtPassword").allowBlank = false; } else { Ext.getCmp("txtPassword").setVisible(false); - Ext.getCmp("txtPassword").allowBlank = true; } } @@ -374,11 +372,9 @@ emailServer.application = { { if (flagMailToChecked) { Ext.getCmp("txtMailTo").setVisible(true); - Ext.getCmp("txtMailTo").allowBlank = false; } else { Ext.getCmp("txtMailTo").setVisible(false); - Ext.getCmp("txtMailTo").allowBlank = true; } } @@ -686,14 +682,14 @@ emailServer.application = { hidden: true }); - /*----------------------------------********---------------------------------*/ + var chkEmailServerDefault = new Ext.form.Checkbox({ id: "chkEmailServerDefault", name: "chkEmailServerDefault", boxLabel: _("ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT") }); - /*----------------------------------********---------------------------------*/ + var btnTest = new Ext.Action({ id: "btnTest", text: _("ID_TEST"), @@ -786,8 +782,7 @@ emailServer.application = { chkSendTestMail, txtMailTo /*----------------------------------********---------------------------------*/ - , - chkEmailServerDefault + , chkEmailServerDefault /*----------------------------------********---------------------------------*/ ] }) From af7904fd597bf54baa07c49cbbb3dc40cff20c2f Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 5 Feb 2015 10:24:19 -0400 Subject: [PATCH 5/5] PM-1468 si no se tiene configurado las opciones de email, en consola sale un mensaje de error al ejecutar el cron. al no ser un bug, lo que se hizo fue agregar un nivel mas de mensaje que es WARNING que se muestra siempre y cuando no exista una coniguracion de email registrada en la base de datos. --- workflow/engine/bin/cron_single.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 42915e652..85b8970c1 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -533,20 +533,20 @@ function resendEmails() setExecutionResultMessage("DONE"); } catch (Exception $e) { - $c = new Criteria("workflow"); + $c = new Criteria("workflow"); $c->clearSelectColumns(); $c->addSelectColumn(ConfigurationPeer::CFG_UID); $c->add(ConfigurationPeer::CFG_UID, "Emails"); $result = ConfigurationPeer::doSelectRS($c); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC); - if($result->next()) { - setExecutionResultMessage("WARNING", "warning"); - $message = "Emails won't send, but the cron will continue with its execution"; - eprintln(" '-" . $message, "yellow"); - } else { - setExecutionResultMessage("WITH ERRORS", "error"); - eprintln(" '-" . $e->getMessage(), "red"); - } + if($result->next()) { + setExecutionResultMessage("WARNING", "warning"); + $message = "Emails won't be sent, but the cron will continue its execution"; + eprintln(" '-" . $message, "yellow"); + } else { + setExecutionResultMessage("WITH ERRORS", "error"); + eprintln(" '-" . $e->getMessage(), "red"); + } saveLog("resendEmails", "error", "Error Resending Emails: " . $e->getMessage()); }