You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/06/12 20:22:13 UTC

[04/50] [abbrv] git commit: updated refs/heads/object_store to 18aeef3

CLOUDSTACK-747: UI - Internal LB detailView - Assigned VMs tab - Assign VMs action - exclude assigned VMs from custom listView dialog.


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

Branch: refs/heads/object_store
Commit: 42a549e42020b533b07810557ae4c05238e1304c
Parents: 21a6271
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jun 5 17:00:33 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jun 5 17:00:33 2013 -0700

----------------------------------------------------------------------
 ui/scripts/vpc.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42a549e4/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 03a85d8..2252387 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -654,8 +654,19 @@
                                 ).length ? true : false;
                               });
                               
+                              //remove assigned VMs (i.e. instance._isSelected == true)
+                              var items = [];
+                              if(instances != null) {
+                                for(var i = 0; i < instances.length; i++) {
+                                  if(instances[i]._isSelected = true)
+                                    continue;
+                                  else
+                                    items.push(instances[i]);
+                                }
+                              }
+                              
                               args.response.success({
-                                data: instances
+                                data: items
                               });
                             }
                           });