You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/05 23:22:18 UTC

git commit: updated refs/heads/4.4 to 6d1c2b1

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 542c2608e -> 6d1c2b14b


CLOUDSTACK-6483: UI > Load Balancing > "VM+IP" listing > After removing a "VM+IP" under a LB rule, AddVMs dialog should reflect the change (i.e. show the removed IP in IP dropdown in AddVMs dialog)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d1c2b14
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d1c2b14
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d1c2b14

Branch: refs/heads/4.4
Commit: 6d1c2b14bf96badbe445964691f1bf790bf2a46a
Parents: 542c260
Author: Jessica Wang <je...@apache.org>
Authored: Mon May 5 13:44:36 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 5 23:20:12 2014 +0200

----------------------------------------------------------------------
 ui/scripts/network.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d1c2b14/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 7a495c1..9d5fb79 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3337,8 +3337,7 @@
                                                 },
                                                                                                 
                                                 dataProvider: function(args) {
-                                                    var itemData = $.isArray(args.context.multiRule) && args.context.multiRule[0]['_itemData'] ?
-                                                        args.context.multiRule[0]['_itemData'] : [];
+                                                	var itemData = $.isArray(args.context.multiRule) && args.context.subItemData ? args.context.subItemData : [];
 
                                                     var networkid;
                                                     if ('vpc' in args.context)