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

Merge branch '4.11': Fixes #2666 conditional template filter (#2669) 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2018-05-24 13:01:11 +05:30
parent 76a4e56ef3 2fad5bea31
commit ca17b6a126
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/scripts/instanceWizard.js
View File

@ -377,6 +377,10 @@
// Step 4: Data disk offering
function(args) {
var isRequired = (args.currentData["select-template"] == "select-iso" ? true : false);
var templateFilter = 'executable'
if (isAdmin()) {
templateFilter = 'all'
}
$.ajax({
url: createURL("listDiskOfferings"),
dataType: "json",
@ -389,7 +393,7 @@
url: createURL("listTemplates"),
data: {
id: args.currentData.templateid,
templatefilter: 'all'
templatefilter: templateFilter
},
dataType: "json",
async: false,