From 49f78d18a88f8156dde1051df76496b8e5180745 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Maharana Date: Thu, 14 Jan 2016 15:23:01 +0530 Subject: [PATCH] CLOUDSTACK-9237: Create LB Healthcheck issues - button alignment and error message goes outside the window Increased the size of width of dialog box. Json response parsing was missing. Added it. --- .../network/lb/LoadBalancingRulesManagerImpl.java | 2 +- ui/scripts/ui-custom/healthCheck.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 402984329d5..8730a7a3a8a 100644 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -596,7 +596,7 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements */ if (!validateHealthCheck(cmd)) { throw new InvalidParameterValueException( - "Failed to create HealthCheck policy: Validation Failed (HealthCheck Policy is not supported by LB Provider for the LB rule id :)" + cmd.getLbRuleId()); + "Failed to create HealthCheck policy: Validation Failed (HealthCheck Policy is not supported by LB Provider for the LB rule id :" + cmd.getLbRuleId() + ")"); } /* Validation : check for the multiple hc policies to the rule id */ diff --git a/ui/scripts/ui-custom/healthCheck.js b/ui/scripts/ui-custom/healthCheck.js index 3280dd9c821..43070c3d211 100644 --- a/ui/scripts/ui-custom/healthCheck.js +++ b/ui/scripts/ui-custom/healthCheck.js @@ -35,9 +35,9 @@ var topFieldForm, bottomFieldForm, $topFieldForm, $bottomFieldForm; var topfields = forms.topFields; - var $healthCheckDesc = $('
' + 'label.health.check.message.desc' + '
').addClass('health-check-description'); - var $healthCheckConfigTitle = $('


' + 'label.health.check.configurations.options' + '
').addClass('health-check-config-title'); - var $healthCheckAdvancedTitle = $('


' + 'label.health.check.advanced.options' + '
').addClass('health-check-advanced-title'); + var $healthCheckDesc = $('
' + _l('label.health.check.message.desc') + '
').addClass('health-check-description'); + var $healthCheckConfigTitle = $('


' + _l('label.health.check.configurations.options') + '
').addClass('health-check-config-title'); + var $healthCheckAdvancedTitle = $('


' + _l('label.health.check.advanced.options') + '
').addClass('health-check-advanced-title'); var $healthCheckDialog = $('
').addClass('health-check'); $healthCheckDialog.append($healthCheckDesc); @@ -200,7 +200,7 @@ error: function(json) { cloudStack.dialog.notice({ - message: _s(json.responseText) + message: parseXMLHttpResponse(json) }); //Error message in the API needs to be improved $healthCheckDialog.dialog('close'); $('.overlay').remove(); @@ -361,8 +361,8 @@ } $healthCheckDialog.dialog({ - title: 'label.health.check.wizard', - width: 600, + title: _l('label.health.check.wizard'), + width: 630, height: 600, draggable: true, closeonEscape: false,