cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 94f1ebb
Date Fri, 29 May 2015 19:19:14 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 666263e84 -> 94f1ebb60


CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules

This closes #302

Signed-off-by: Rohit Yadav <rohit.yadav@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/master
Commit: 94f1ebb60af320166206c213e18b97a177bc145a
Parents: 666263e
Author: Vadim Kimlaychuk <vadim@ant.ee>
Authored: Fri May 29 21:18:49 2015 +0200
Committer: Rohit Yadav <rohit.yadav@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


Mime
View raw message