From 8fb7cfae0ce3d4908ad1d1da9072a2ed6585e68f Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 15 Oct 2014 16:12:52 -0700 Subject: [PATCH] CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by account view > listView > detailView > add View All link (i.e. "View all Virtual Routers"). --- ui/scripts/system.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index fbd2f2b9935..f87de623074 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -9484,7 +9484,18 @@ * 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 - $.ajax({ + /* + * 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, async: false, @@ -10565,13 +10576,11 @@ }); }, detailView: { - name: 'label.virtual.routers.group.account', - /* + name: 'label.virtual.routers.group.account', viewAll: { path: '_zone.virtualRouters', label: 'label.virtual.appliances' - }, - */ + }, actions: { upgradeRouterToUseNewerTemplate: { label: 'label.upgrade.router.newer.template',