cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to c49a09f
Date Thu, 16 Oct 2014 19:09:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 e225065ec -> c49a09fad


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


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

Branch: refs/heads/4.5
Commit: c49a09fad0ad830a3ce56511da5cd568d56c594c
Parents: e225065
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Oct 15 16:12:52 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Oct 16 12:08:58 2014 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c49a09fa/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index fbd2f2b..f87de62 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',


Mime
View raw message