CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules This closes #302
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit 94f1ebb60af320166206c213e18b97a177bc145a) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8e1ff12 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8e1ff12 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8e1ff12 Branch: refs/heads/master Commit: f8e1ff12abdf3c152db96e590c5118c8d7d72db2 Parents: 00fffbe Author: Vadim Kimlaychuk <va...@ant.ee> Authored: Fri May 29 21:18:49 2015 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Fri May 29 21:19:26 2015 +0200 ---------------------------------------------------------------------- ui/scripts/network.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8e1ff12/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 1ec1cf7..9280823 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1697,8 +1697,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 @@ -3541,8 +3542,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
