From f8e1ff12abdf3c152db96e590c5118c8d7d72db2 Mon Sep 17 00:00:00 2001 From: Vadim Kimlaychuk Date: Fri, 29 May 2015 21:18:49 +0200 Subject: [PATCH] CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules This closes #302 Signed-off-by: Rohit Yadav (cherry picked from commit 94f1ebb60af320166206c213e18b97a177bc145a) Signed-off-by: Rohit Yadav --- ui/scripts/network.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 1ec1cf70e0e..92808234577 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