[cloudstack] branch 4.11 updated: ui: Fixes #2666 conditional template filter (#2669)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new 2fad5be  ui: Fixes #2666 conditional template filter (#2669)
2fad5be is described below

commit 2fad5bea31c247c177d086b95918b12a18d02f71
Author: dahn <da...@gmail.com>
AuthorDate: Thu May 24 09:29:57 2018 +0200

    ui: Fixes #2666 conditional template filter (#2669)
    
    This fixes issue of warning when deploying vm as non-root admin user account.
---
 ui/scripts/instanceWizard.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 680c6ae..a3d735a 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,

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.