From 7cec710e4ee561364cc00aa0d6b33b1db92a4d20 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 16 Aug 2013 16:00:52 -0400 Subject: [PATCH 1/4] BUG 12659 Adicion de etiquetas hardcodeada SOLVED Se agrego una etiqueta nueva --- workflow/engine/menus/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index 5e83459f3..b6ed73490 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -70,7 +70,7 @@ if (!$partnerFlag) { //tools options if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 ) { if (!$partnerFlag) { - $G_TMP_MENU->AddIdRawOption('PLUGINS', 'pluginsMain', 'Plugins Manager', 'icon-plugins.png', '', 'plugins'); + $G_TMP_MENU->AddIdRawOption('PLUGINS', 'pluginsMain', G::LoadTranslation('ID_PLUGINS_MANAGER'), 'icon-plugins.png', '', 'plugins'); } } From 1bff15da35384b0d5cc358f0260025d3e49f2ce4 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Tue, 20 Aug 2013 09:35:16 -0400 Subject: [PATCH 2/4] BUG 12679 Error al crear template con nombre etiqueta SOLVED Se agrego un filtro para crear con etiqueta existente --- workflow/engine/classes/class.case.php | 2 +- workflow/engine/classes/class.processes.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 3a4f99ac8..beb94c666 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -4946,7 +4946,7 @@ class Cases G::verifyPath($pathEmail, true); //Create if it does not exist $fileTemplate = $pathEmail . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'); - if (!file_exists($fileTemplate)) { + if ((!file_exists($fileTemplate)) && file_exists($fileTemplate)) { @copy(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'), $fileTemplate); } diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index ace53dec5..fd9bf8e58 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -3865,7 +3865,7 @@ class Processes @copy( PATH_TPL . "mails" . PATH_SEP . "alert_message.html", $dir . "alert_message.html" ); } - if (! file_exists( $dir . "unassignedMessage.html" )) { + if ( (!file_exists( $dir . "unassignedMessage.html")) && file_exists($dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'))) { if (defined('PARTNER_FLAG')) { @copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessagePartner.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE')); } else { From e65e0fe9b71861f29cb0bcf739be8f6f08d64e18 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Tue, 20 Aug 2013 16:43:01 -0400 Subject: [PATCH 3/4] Arreglo para actualizacion de lenguaje de plugins enterprise --- workflow/engine/classes/model/Language.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php index 3c5a8f047..942574f2d 100755 --- a/workflow/engine/classes/model/Language.php +++ b/workflow/engine/classes/model/Language.php @@ -644,6 +644,7 @@ class Language extends BaseLanguage $trn = new Translation(); $trn->generateFileTranslationPlugin( $plugin, $idLanguage ); $trn->addTranslationEnvironmentPlugins( $plugin, $idLanguage, $POHeaders, $countItemsSuccess ); + $languageID = (isset($languageID)) ? $languageID : $idLanguage; //fill the results $results = new stdClass(); From ad5d438a4c0e5178b6940939233ab09dd1762a0e Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 21 Aug 2013 10:53:36 -0400 Subject: [PATCH 4/4] Arreglod de sentencia if --- workflow/engine/classes/class.case.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index beb94c666..26253506b 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -4946,7 +4946,7 @@ class Cases G::verifyPath($pathEmail, true); //Create if it does not exist $fileTemplate = $pathEmail . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'); - if ((!file_exists($fileTemplate)) && file_exists($fileTemplate)) { + if ((!file_exists($fileTemplate)) && file_exists(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'))) { @copy(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'), $fileTemplate); }