You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/20 22:05:46 UTC
[1/2] git commit: updated refs/heads/4.7 to c99f57f
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 <ni...@gmail.com>
Authored: Thu Jan 14 15:23:01 2016 +0530
Committer: Nitin Kumar Maharana <ni...@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,
[2/2] git commit: updated refs/heads/4.7 to c99f57f
Posted by re...@apache.org.
Merge pull request #1340 from nitin-maharana/CloudStack-Nitin23_4.7
CLOUDSTACK-9237: Create LB Healthcheck issues - button alignment and error message goes outside the windowBrowser - Chrome Version 47.0.2526.106 m
Steps to Repro:
============
Open up - Network-Guest Networks -> IP Addresses-> IP<Static NAT> -> Load Balancing
- click on the "Configure" button below the healthcheck,
- opens a "label.heath.check.wizard"
Issues:
======
(1) Please see the snapshot attached
- leave the default values as is and click on the "Create"
- opens a "Status" dialog with an error message
(2) Message on the dialog goes outside the window
Fix:
===
Increased the size of width of dialog box.
Json response parsing was missing. Added it.
Snapshot for Error Message Issue:
===========================
Snapshot of the fix:
===============
<img width="627" alt="fixed_ss1_nitin" src="https://cloud.githubusercontent.com/assets/12583725/12320935/76613368-bad1-11e5-8540-cbd565edff9f.png">
Snapshot for out of window issue:
==========================
Snapshot of the fix:
===============
<img width="695" alt="fixed_ss2_nitin" src="https://cloud.githubusercontent.com/assets/12583725/12320970/a3f7e2ae-bad1-11e5-8a9c-d2811aa6effc.png">
* pr/1340:
CLOUDSTACK-9237: Create LB Healthcheck issues - button alignment and error message goes outside the window
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c99f57fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c99f57fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c99f57fc
Branch: refs/heads/4.7
Commit: c99f57fc936897a1eb897066fbf284407965cddb
Parents: ed23ac6 49f78d1
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Jan 20 22:03:53 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Jan 20 22:03:53 2016 +0100
----------------------------------------------------------------------
.../cloud/network/lb/LoadBalancingRulesManagerImpl.java | 2 +-
ui/scripts/ui-custom/healthCheck.js | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------