From 46433c1e921ef38e39f180b084d1e0b18e30e620 Mon Sep 17 00:00:00 2001 From: Vadim Kimlaychuk Date: Wed, 20 May 2015 22:08:29 +0300 Subject: [PATCH] CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules This closes #271 This closes #302 (cherry picked from commit f8e1ff12abdf3c152db96e590c5118c8d7d72db2) Signed-off-by: Rohit Yadav --- ui/scripts/network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9eaa33a6fb5..92808234577 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1698,7 +1698,8 @@ description: _l('label.lb.algorithm.source') }]; if (typeof args.context != 'undefined') { - data = getLBAlgorithms(args.context.networks[0]); + var lbAlgs = getLBAlgorithms(args.context.networks[0]); + data = (lbAlgs.length == 0) ? data : lbAlgs; } args.response.success({ data: data @@ -3542,7 +3543,8 @@ description: _l('label.lb.algorithm.source') }]; if (typeof args.context != 'undefined') { - data = getLBAlgorithms(args.context.networks[0]); + var lbAlgs = getLBAlgorithms(args.context.networks[0]); + data = (lbAlgs.length == 0) ? data : lbAlgs; } args.response.success({ data: data