cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/4.7 to c99f57f
Date Wed, 20 Jan 2016 21:05:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.7 ed23ac627 -> c99f57fc9


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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/49f78d18
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/49f78d18
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/49f78d18

Branch: refs/heads/4.7
Commit: 49f78d18a88f8156dde1051df76496b8e5180745
Parents: 80703ca
Author: Nitin Kumar Maharana <nitin.maharana@gmail.com>
Authored: Thu Jan 14 15:23:01 2016 +0530
Committer: Nitin Kumar Maharana <nitin.maharana@gmail.com>
Committed: Thu Jan 14 15:23:01 2016 +0530

----------------------------------------------------------------------
 .../cloud/network/lb/LoadBalancingRulesManagerImpl.java |  2 +-
 ui/scripts/ui-custom/healthCheck.js                     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49f78d18/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 4029843..8730a7a 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<Type> 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 */

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49f78d18/ui/scripts/ui-custom/healthCheck.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/healthCheck.js b/ui/scripts/ui-custom/healthCheck.js
index 3280dd9..43070c3 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 = $('<div>' + 'label.health.check.message.desc' +
'</div>').addClass('health-check-description');
-            var $healthCheckConfigTitle = $('<div><br><br>' + 'label.health.check.configurations.options'
+ '</div>').addClass('health-check-config-title');
-            var $healthCheckAdvancedTitle = $('<div><br><br>' + 'label.health.check.advanced.options'
+ '</div>').addClass('health-check-advanced-title');
+            var $healthCheckDesc = $('<div>' + _l('label.health.check.message.desc')
+ '</div>').addClass('health-check-description');
+            var $healthCheckConfigTitle = $('<div><br><br>' + _l('label.health.check.configurations.options')
+ '</div>').addClass('health-check-config-title');
+            var $healthCheckAdvancedTitle = $('<div><br><br>' + _l('label.health.check.advanced.options')
+ '</div>').addClass('health-check-advanced-title');
 
             var $healthCheckDialog = $('<div>').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,


Mime
View raw message