You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/08 11:45:30 UTC
[09/50] [abbrv] git commit: updated refs/heads/feature/vpc-ipv6 to
6140db5
CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules
This closes #302
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94f1ebb6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94f1ebb6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94f1ebb6
Branch: refs/heads/feature/vpc-ipv6
Commit: 94f1ebb60af320166206c213e18b97a177bc145a
Parents: 666263e
Author: Vadim Kimlaychuk <va...@ant.ee>
Authored: Fri May 29 21:18:49 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri May 29 21:18:49 2015 +0200
----------------------------------------------------------------------
ui/scripts/network.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94f1ebb6/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d857b73..4e337fb 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1703,8 +1703,9 @@
name: 'source',
description: _l('label.lb.algorithm.source')
}];
- if (typeof args.context == 'undefined') {
- data = getLBAlgorithms(args.context.networks[0]);
+ if (typeof args.context != 'undefined') {
+ var lbAlgs = getLBAlgorithms(args.context.networks[0]);
+ data = (lbAlgs.length == 0) ? data : lbAlgs;
}
args.response.success({
data: data
@@ -3551,8 +3552,9 @@
name: 'source',
description: _l('label.lb.algorithm.source')
}];
- if (typeof args.context == 'undefined') {
- data = getLBAlgorithms(args.context.networks[0]);
+ if (typeof args.context != 'undefined') {
+ var lbAlgs = getLBAlgorithms(args.context.networks[0]);
+ data = (lbAlgs.length == 0) ? data : lbAlgs;
}
args.response.success({
data: data