CS-14769 -Don't pass subdomainaccess param when scope=project
-Fix guest network detail view by passing projectid=-1, due to project details not returning response for project-level guest networks Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/07382963 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/07382963 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/07382963 Branch: refs/heads/master Commit: 073829638fd3b76bd9cb5a43030a972c5f259216 Parents: 7c1698f Author: Brian Federle <[email protected]> Authored: Wed May 30 08:13:09 2012 -0700 Committer: bfederle <[email protected]> Committed: Tue Jun 19 11:11:11 2012 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/07382963/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 60722cb..9ab0a39 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1350,11 +1350,6 @@ else if($form.find('.form-item[rel=projectId]').css("display") != "none") { //project-specific array1.push("&projectid=" + args.data.projectId); array1.push("&acltype=account"); - - if ($form.find('.form-item[rel=subdomainaccess]:visible input:checked').size()) - array1.push("&subdomainaccess=true"); - else - array1.push("&subdomainaccess=false"); } else { //domain-specific array1.push("&acltype=domain"); @@ -1758,7 +1753,7 @@ ], dataProvider: function(args) { $.ajax({ - url: createURL("listNetworks&id=" + args.context.networks[0].id + "&listAll=true"), //pass "&listAll=true" to "listNetworks&id=xxxxxxxx" for now before API gets fixed. + url: createURL("listNetworks&id=" + args.context.networks[0].id + "&listAll=true" + "&projectid=-1"), //pass "&listAll=true" to "listNetworks&id=xxxxxxxx" for now before API gets fixed. dataType: "json", async: false, success: function(json) {
