From 7cb0351eaad010e761a6439998be193bae7da790 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 20 Mar 2012 16:15:47 -0700 Subject: [PATCH] bug 14425: cloudstack 3.0 UI - infrastructure page - create guest network - not pass subDomainAccess to createNetwork API when scope is Account. --- ui/scripts/system.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index dc3246dd7ed..97620e3b8b6 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1201,12 +1201,6 @@ if($form.find('.form-item[rel=domainId]').css("display") != "none") { array1.push("&domainId=" + args.data.domainId); - if ($form.find('.form-item[rel=subdomainaccess]:visible input:checked').size()) { - array1.push("&subdomainaccess=true"); - } else { - array1.push("&subdomainaccess=false"); - } - if($form.find('.form-item[rel=account]').css("display") != "none") { //account-specific array1.push("&account=" + args.data.account); array1.push("&acltype=account"); @@ -1214,9 +1208,19 @@ 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"); + array1.push("&acltype=domain"); + + if ($form.find('.form-item[rel=subdomainaccess]:visible input:checked').size()) + array1.push("&subdomainaccess=true"); + else + array1.push("&subdomainaccess=false"); } } else { //zone-wide