cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject [2/2] git commit: updated refs/heads/master to bf72a36
Date Mon, 08 Apr 2013 21:46:55 GMT
CLOUDSTACK-1974: cloudstack UI - Infrastructure menu - zone detail - public traffic type -
IP Ranges tab - add new action "Release from account", "Add Account" for existing IP Ranges.


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

Branch: refs/heads/master
Commit: bf72a36ea809ec0f9b354bf6a72dd2a09e1fcf6f
Parents: d6ed8d7
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Mon Apr 8 14:39:18 2013 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Mon Apr 8 14:46:23 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js |   78 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72a36e/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 8d08584..d89f6b6 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -588,7 +588,83 @@
                             }
                           });
                         }
-                      }
+                      },
+											/*
+											releaseFromAccount: {
+                        label: 'Release from Account',
+                        action: function(args) {
+                          $.ajax({
+                            url: createURL('releasePublicIpRange'),
+                            data: {
+														  id: args.context.multiRule[0].id
+														},                            
+                            success: function(json) {
+                              args.response.success({
+                                notification: {
+                                  label: 'release from account',
+                                  poll: function(args) {
+                                    args.complete();
+                                  }
+                                }
+                              });
+                            },
+                            error: function(json) {
+                              args.response.error(parseXMLHttpResponse(json));
+                            }
+                          });
+                        }
+                      },
+											addAccount: {
+											  label: 'Add Account',												
+												createForm: {
+													title: 'Add Account',
+													fields: {
+														account: { label: 'Account' },
+														domainid: {
+															label: 'Domain',															
+															select: function(args) {
+																$.ajax({
+																	url: createURL('listDomains'),
+																	data: { listAll: true },
+																	success: function(json) {
+																		args.response.success({
+																			data: $.map(json.listdomainsresponse.domain, function(domain) {
+																				return {
+																					id: domain.id,
+																					description: domain.path
+																				};
+																			})
+																		});
+																	}
+																});
+															}
+														}
+													}
+												},												
+												action: function(args) {                          							
+												  var data = {
+														id: args.context.multiRule[0].id
+													};												
+                          $.ajax({
+                            url: createURL('dedicatePublicIpRange'),
+                            data: data,                        
+                            success: function(json) {
+                              args.response.success({
+                                notification: {
+                                  label: 'Add Account',
+                                  poll: function(args) {
+                                    args.complete();
+                                  }
+                                }
+                              });
+                            },
+                            error: function(json) {
+                              args.response.error(parseXMLHttpResponse(json));
+                            }
+                          });
+                        }
+											}
+											*/
                     },
                     dataProvider: function(args) {
                       $.ajax({


Mime
View raw message