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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
dheeyi
2015-05-12 11:10:03 -04:00
parent f42b24ec3b 5806b2206a
commit 08de7e7256
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/model/AddonsStore.php
View File

@@ -100,13 +100,12 @@ class AddonsStore extends BaseAddonsStore
} }
$sw = 1; $sw = 1;
$addonInLicense = in_array($addon->getAddonId(), $licenseManager->features);
if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) {
$sw = 0;
}
if ($type == 'plugin') { 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 ($sw == 1 && $addon->isInstalled()) {
if ($addon->isEnabled()) { if ($addon->isEnabled()) {
$status = "installed"; $status = "installed";
@@ -126,7 +125,8 @@ class AddonsStore extends BaseAddonsStore
} else { } else {
$status = "available"; $status = "available";
$enabled = false; $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"; $status = "installed";
$enabled = true; $enabled = true;
} }

1
workflow/engine/skinEngine/neoclassic/css/loginStyle.css
View File

@@ -41,6 +41,7 @@ img.img-responsive {
margin-bottom: 20px; margin-bottom: 20px;
margin-left: 50px; margin-left: 50px;
margin-right: 50px; margin-right: 50px;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
} }
.login .panel-default > .panel-heading { .login .panel-default > .panel-heading {

3
workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
View File

@@ -227,7 +227,7 @@ class MessageEventDefinition
$flagCheckData = (isset($arrayData["MSGT_UID"]) && $arrayData["MSGT_UID"] . "" != "")? true : $flagCheckData; $flagCheckData = (isset($arrayData["MSGT_UID"]) && $arrayData["MSGT_UID"] . "" != "")? true : $flagCheckData;
$flagCheckData = (isset($arrayData["MSGED_VARIABLES"]))? 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(); $arrayMessageTypeVariable = array();
$arrayMessageTypeData = $messageType->getMessageType($arrayFinalData["MSGT_UID"], true); $arrayMessageTypeData = $messageType->getMessageType($arrayFinalData["MSGT_UID"], true);
@@ -632,3 +632,4 @@ class MessageEventDefinition
} }
} }
} }