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

bug 12415 

Don't pass projectID for templates or ISOs, unless listing 'My'
templates/ISOs

status 12415: Resolved fixed
This commit is contained in:
bfederle 2012-01-30 13:35:11 -08:00
parent cc63a451a7
commit 3cb7453979
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/scripts/templates.js
View File

@ -290,20 +290,24 @@
},
dataProvider: function(args) {
var array1 = [];
var array1 = [];
var ignoreProject = false;
if(args.filterBy != null) {
if(args.filterBy.kind != null) {
switch(args.filterBy.kind) {
case "all":
ignoreProject = true;
array1.push("&templatefilter=all");
break;
case "mine":
array1.push("&templatefilter=self");
break;
case "featured":
ignoreProject = true;
array1.push("&templatefilter=featured");
break;
case "community":
ignoreProject = true;
array1.push("&templatefilter=community");
break;
}
@ -318,7 +322,8 @@
}
}
$.ajax({
url: createURL("listTemplates&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
url: createURL("listTemplates&page=" + args.page + "&pagesize=" + pageSize + array1.join(""),
{ ignoreProject: ignoreProject }),
dataType: "json",
async: true,
success: function(json) {
@ -839,20 +844,24 @@
},
dataProvider: function(args) {
var array1 = [];
var array1 = [];
var ignoreProject = false;
if(args.filterBy != null) {
if(args.filterBy.kind != null) {
switch(args.filterBy.kind) {
case "all":
ignoreProject = true;
array1.push("&isofilter=all");
break;
case "mine":
array1.push("&isofilter=self");
break;
case "featured":
ignoreProject = true;
array1.push("&isofilter=featured");
break;
case "community":
ignoreProject = true;
array1.push("&isofilter=community");
break;
}
@ -868,7 +877,7 @@
}
$.ajax({
url: createURL("listIsos&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
url: createURL("listIsos&page=" + args.page + "&pagesize=" + pageSize + array1.join(""), { ignoreProject: ignoreProject }),
dataType: "json",
async: true,
success: function(json) {