[GitHub] rhtyd closed pull request #2669: conditional template filter

[GitBox <gi...@apache.org>]

rhtyd closed pull request #2669: conditional template filter
URL: https://github.com/apache/cloudstack/pull/2669
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 680c6ae44a7..a3d735a6860 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -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,


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services