apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by account view > listView > detailView > add View All link (i.e. "View all Virtual Routers").

Browse Source
This commit is contained in:
Jessica Wang 2014-10-15 16:12:52 -07:00
parent 314a7fe62b
commit 8fb7cfae0c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/scripts/system.js
View File

@ -9484,6 +9484,17 @@
* Therefore, we only call the second listRouters API(with projectid=-1) in non-project view.
*/
if (cloudStack.context && cloudStack.context.projects == null) { //non-project view
/*
* account parameter(account+domainid) and project parameter(projectid) are not allowed to be passed together to listXXXXXXX API.
* So, remove account parameter(account+domainid) from data2
*/
if ("account" in data2) {
delete data2.account;
}
if ("domainid" in data2) {
delete data2.domainid;
}
$.ajax({
url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
data: data2,
@ -10566,12 +10577,10 @@
},
detailView: {
name: 'label.virtual.routers.group.account',
/*
viewAll: {
path: '_zone.virtualRouters',
label: 'label.virtual.appliances'
},
*/
actions: {
upgradeRouterToUseNewerTemplate: {
label: 'label.upgrade.router.newer.template',