You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/08/07 00:59:42 UTC
git commit: cloudstack 3.0 UI - infrastructure - zone detail -
network service providers - Virtual Router - Instances tab - exclude VPC
Virtual Router here.
Updated Branches:
refs/heads/vpc 648dcf0cc -> 1e69966f7
cloudstack 3.0 UI - infrastructure - zone detail - network service providers - Virtual Router - Instances tab - exclude VPC Virtual Router here.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1e69966f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1e69966f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1e69966f
Branch: refs/heads/vpc
Commit: 1e69966f7537eaf591a46abe3b9e17944ac3ce47
Parents: 648dcf0
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Aug 6 14:41:06 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Aug 6 15:59:11 2012 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1e69966f/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 142a41f..52bb16b 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1987,8 +1987,9 @@
var routers = [];
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
- dataType: 'json',
- async: true,
+ data: {
+ forvpc: false
+ },
success: function(json) {
var items = json.listroutersresponse.router ?
json.listroutersresponse.router : [];
@@ -2000,8 +2001,9 @@
// Get project routers
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
- dataType: 'json',
- async: true,
+ data: {
+ forvpc: false
+ },
success: function(json) {
var items = json.listroutersresponse.router ?
json.listroutersresponse.router : [];
@@ -2683,7 +2685,7 @@
project: { label: 'label.project' }
},
{
- id: { label: 'label.id' },
+ id: { label: 'label.id' },
projectid: { label: 'label.project.id' },
state: { label: 'label.state' },
publicip: { label: 'label.public.ip' },
@@ -2699,7 +2701,8 @@
label: 'label.redundant.router',
converter: cloudStack.converters.toBooleanText
},
- redundantRouterState: { label: 'label.redundant.state' }
+ redundantRouterState: { label: 'label.redundant.state' },
+ vpcid: { label: 'VPC ID' }
}
],
dataProvider: function(args) {
@@ -4710,8 +4713,9 @@
var routers = [];
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
- dataType: 'json',
- async: true,
+ data: {
+ forvpc: false
+ },
success: function(json) {
var items = json.listroutersresponse.router ?
json.listroutersresponse.router : [];
@@ -4722,8 +4726,9 @@
// Get project routers
$.ajax({
url: createURL("listRouters&zoneid=" + selectedZoneObj.id + "&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
- dataType: 'json',
- async: true,
+ data: {
+ forvpc: false
+ },
success: function(json) {
var items = json.listroutersresponse.router ?
json.listroutersresponse.router : [];
@@ -5038,7 +5043,8 @@
label: 'label.redundant.router',
converter: cloudStack.converters.toBooleanText
},
- redundantRouterState: { label: 'label.redundant.state' }
+ redundantRouterState: { label: 'label.redundant.state' },
+ vpcid: { label: 'VPC ID' }
}
],
dataProvider: function(args) {