From c8c3b847736e9ea543c36569d33939e0a1b0add4 Mon Sep 17 00:00:00 2001 From: jonathan Date: Mon, 11 May 2015 10:42:08 -0400 Subject: [PATCH 1/3] pm2646 --- workflow/engine/skinEngine/neoclassic/css/loginStyle.css | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css index fa21b0a80..23fbce207 100644 --- a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -41,6 +41,7 @@ img.img-responsive { margin-bottom: 20px; margin-left: 50px; margin-right: 50px; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; } .login .panel-default > .panel-heading { From 2226e8a616472cfc329a9db627a276842a01343b Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 11 May 2015 13:41:29 -0400 Subject: [PATCH 2/3] PM-2068 "Designer > Event > Properties: muestra un mensaje de..." SOLVED Issue: Designer > Event > Properties: muestra un mensaje de error al hacer click en SAVE. Cause: Falto considerar que el campo "Message Type" es no requerido Solution: - Se completa esta validacion - Un "Start y End Message Event" puede tener definido, como tambien no, un "Message Type"; ya que este tiene las variables que se desearia pasar al caso, por lo que tambien se requeriria no pasar nada --- .../src/ProcessMaker/BusinessModel/MessageEventDefinition.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php b/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php index 4a1993331..5899b59b0 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php @@ -227,7 +227,7 @@ class MessageEventDefinition $flagCheckData = (isset($arrayData["MSGT_UID"]) && $arrayData["MSGT_UID"] . "" != "")? true : $flagCheckData; $flagCheckData = (isset($arrayData["MSGED_VARIABLES"]))? true : $flagCheckData; - if ($flagCheckData && $arrayFinalData["MSGT_UID"] . "" != "") { + if (isset($arrayFinalData["MSGT_UID"]) && $arrayFinalData["MSGT_UID"] . "" != "" && $flagCheckData) { $arrayMessageTypeVariable = array(); $arrayMessageTypeData = $messageType->getMessageType($arrayFinalData["MSGT_UID"], true); @@ -632,3 +632,4 @@ class MessageEventDefinition } } } + From 5d9a5dce6d74782ea52aca8df3b58da2e398b4db Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 11 May 2015 15:56:02 -0400 Subject: [PATCH 3/3] Some validation in AddonsStore --- workflow/engine/classes/model/AddonsStore.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php index 7d7daec9d..36e38a3e3 100644 --- a/workflow/engine/classes/model/AddonsStore.php +++ b/workflow/engine/classes/model/AddonsStore.php @@ -100,13 +100,12 @@ class AddonsStore extends BaseAddonsStore } $sw = 1; - $addonInLicense = in_array($addon->getAddonId(), $licenseManager->features); - - if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) { - $sw = 0; - } - if ($type == 'plugin') { + $addonInLicense = in_array($addon->getAddonId(), $licenseManager->features); + + if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) { + $sw = 0; + } if ($sw == 1 && $addon->isInstalled()) { if ($addon->isEnabled()) { $status = "installed"; @@ -126,7 +125,8 @@ class AddonsStore extends BaseAddonsStore } else { $status = "available"; $enabled = false; - if (!$addonInLicense && in_array($addon->getAddonName(), $licenseManager->licensedfeatures) == 1) { + $addonInLicense = in_array($addon->getAddonId(), $licenseManager->licensedfeatures); + if (in_array($addon->getAddonName(), $licenseManager->licensedfeatures) == 1) { $status = "installed"; $enabled = true; }