From 3355c6cffe44c7afea33b5cd641b752e5cece79a Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 9 Jan 2012 16:23:00 -0800 Subject: [PATCH] bug 12306: cloudstack 3.0 new UI - create service offering, create disk offering - pass listAll=true when calling listDomains to populate domain dropdown. --- ui/scripts/configuration.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index f3d959041bc..e2146f2ed13 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -105,9 +105,12 @@ domainId: { label: 'Domain', dependsOn: 'isPublic', - select: function(args) { + select: function(args) { + var array1 = []; + if(isAdmin()) + array1.push("&listAll=true"); $.ajax({ - url: createURL("listDomains"), + url: createURL("listDomains" + array1.join("")), dataType: "json", async: false, success: function(json) { @@ -417,8 +420,11 @@ label: 'Domain', dependsOn: 'isPublic', select: function(args) { + var array1 = []; + if(isAdmin()) + array1.push("&listAll=true"); $.ajax({ - url: createURL("listDomains"), + url: createURL("listDomains" + array1.join("")), dataType: "json", async: false, success: function(json) { @@ -726,8 +732,11 @@ label: 'Domain', dependsOn: 'isPublic', select: function(args) { + var array1 = []; + if(isAdmin()) + array1.push("&listAll=true"); $.ajax({ - url: createURL("listDomains"), + url: createURL("listDomains" + array1.join("")), dataType: "json", async: false, success: function(json) {