You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/07/25 00:28:00 UTC
[1/11] git commit: Add tag UI support for VPC resource types:
Updated Branches:
refs/heads/vpc a00456bc5 -> 8683fc4e0
Add tag UI support for VPC resource types:
- Vpc,
- NetworkACL,
- StaticRoute
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8683fc4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8683fc4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8683fc4e
Branch: refs/heads/vpc
Commit: 8683fc4e057a0d345bc3af5279b19a74d5287a95
Parents: 5126ca9
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jul 24 13:58:02 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jul 24 15:26:59 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 3 +++
ui/scripts/vpc.js | 33 +++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8683fc4e/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 81a980c..e268850 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3784,6 +3784,9 @@
id: { label: 'label.id' }
}
],
+
+ tags: cloudStack.api.tags({ resourceType: 'Vpc', contextId: 'vpc' }),
+
dataProvider: function(args) {
$.ajax({
url: createURL("listVPCs"),
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8683fc4e/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 11999fb..08e2e4b 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -84,6 +84,9 @@
addButton: true
}
},
+
+ tags: cloudStack.api.tags({ resourceType: 'NetworkACL', contextId: 'multiRule' }),
+
add: {
label: 'Add',
action: function(args) {
@@ -111,6 +114,19 @@
}
},
actions: {
+ edit: {
+ label: 'label.edit',
+
+ // Blank -- edit is just for tags right now
+ action: function(args) {
+ args.response.success({
+ notification: {
+ label: 'Edit ACL item',
+ poll: function(args) { args.complete(); }
+ }
+ });
+ }
+ },
destroy: {
label: 'Remove ACL',
action: function(args) {
@@ -596,6 +612,9 @@
addButton: true
}
},
+
+ tags: cloudStack.api.tags({ resourceType: 'StaticRoute', contextId: 'multiRule' }),
+
add: {
label: 'Add',
action: function(args) {
@@ -623,6 +642,19 @@
}
},
actions: {
+ edit: {
+ label: 'label.edit',
+
+ // Blank -- edit is just for tags right now
+ action: function(args) {
+ args.response.success({
+ notification: {
+ label: 'Edit static route',
+ poll: function(args) { args.complete(); }
+ }
+ });
+ }
+ },
destroy: {
label: 'Remove static route',
action: function(args) {
@@ -885,6 +917,7 @@
created: { label: 'label.date', converter: cloudStack.converters.toLocalDate }
}
],
+
dataProvider: function(args) {
$.ajax({
url: createURL("listVpnConnections&id=" + args.context.vpnConnection[0].id),