cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.4 to 588acac
Date Tue, 08 Apr 2014 21:04:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 220309c64 -> 588acac76


CLOUDSTACK-6342: UI - Load Balancing page - LB rules - VM + IP Address - remove action - pass
vmidipmap instead of virtualmachineids to removeFromLoadBalancerRule API where IP Address
is specified for this VM under this LB rule.


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

Branch: refs/heads/4.4
Commit: 588acac769b254103c9903b55471e51744d4201b
Parents: 220309c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Apr 8 14:04:30 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Apr 8 14:04:30 2014 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/588acac7/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 0bf5d91..660838b 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3766,7 +3766,21 @@
                                             },
                                             destroy: {
                                                 label: 'label.remove.vm.from.lb',
-                                                action: function(args) {
+                                                action: function(args) {                
                               	
+                                                	var inputData;
+                                                	if (args.item.itemIp == undefined) {
+                                                		inputData = {
+                                                            id: args.multiRule.id,
+                                                            virtualmachineids: args.item.id
+                                                        };
+                                                	} else {                               
                		
+                                                		inputData = {
+                                                            id: args.multiRule.id,
+                                                            "vmidipmap[0].vmid": args.item.id,
+                                                            "vmidipmap[0].vmip": args.item.itemIp
                                                           
+                                                        };   
+                                                	}                                      
         	
+                                                	
                                                     $.ajax({
                                                         url: createURL('removeFromLoadBalancerRule'),
                                                         data: {


Mime
View raw message