etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

reviewed-by: jessica
This commit is contained in:
Brian Federle 2012-05-30 08:13:55 -07:00
parent 54277062f3
commit caadccaa35
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/scripts/system.js
View File

@ -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) {