From 2c88e156249c55dacc7bce9a7e9cd06de6d19c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 18 Feb 2016 18:13:26 +0100
Subject: [PATCH] Feature #4317: Remove any mention to saved templates in cloud
 view

The templates tab now shows any visible template, not just
those created from a saved VM
---
 .../app/tabs/provision-tab/templates/list.hbs       |  7 +++----
 .../public/app/tabs/provision-tab/templates/list.js | 13 +++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs b/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs
index dc3b9a5828..e5ed95617c 100644
--- a/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs
@@ -41,10 +41,9 @@
           <table class="provision_templates_table">
             <thead class="hidden">
               <tr>
-                <th>{{tr "ID"}}</th>
-                <th>{{tr "Name"}}</th>
-                <th>{{tr "Saved"}}</th>
-                <th>{{tr "User ID"}}</th>
+                <th>ID</th>
+                <th>Name</th>
+                <th>User ID</th>
               </tr>
             </thead>
             <tbody class="hidden"></tbody>
diff --git a/src/sunstone/public/app/tabs/provision-tab/templates/list.js b/src/sunstone/public/app/tabs/provision-tab/templates/list.js
index c90aa10c7e..f890cd796a 100644
--- a/src/sunstone/public/app/tabs/provision-tab/templates/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/templates/list.js
@@ -50,7 +50,7 @@ define(function(require) {
 
   function html(opts_arg){
     opts = $.extend({
-        title: Locale.tr("Saved Templates"),
+        title: Locale.tr("Templates"),
         refresh: true,
         create: true,
         active: true,
@@ -114,7 +114,6 @@ define(function(require) {
       "aoColumns": [
           { "mDataProp": "VMTEMPLATE.ID" },
           { "mDataProp": "VMTEMPLATE.NAME" },
-          { "mDataProp": "VMTEMPLATE.TEMPLATE.SAVED_TEMPLATE_ID", "sDefaultContent" : "-"  },
           { "mDataProp": "VMTEMPLATE.UID" }
       ],
       "fnPreDrawCallback": function (oSettings) {
@@ -128,7 +127,7 @@ define(function(require) {
             '<br>'+
             '<br>'+
             '<span style="font-size: 18px; color: #999">'+
-              Locale.tr("There are no saved templates available")+
+              Locale.tr("There are no templates available")+
               '<br>'+
               Locale.tr("Create a template by saving a running Virtual Machine")+
             '</span>'+
@@ -158,7 +157,7 @@ define(function(require) {
         }
 
         $(".provision_templates_ul", context).append('<li>'+
-            '<ul class="provision-pricing-table" opennebula_id="'+data.ID+'" saved_to_image_id="'+data.TEMPLATE.SAVED_TO_IMAGE_ID+'" datatable_index="'+iDisplayIndexFull+'">'+
+            '<ul class="provision-pricing-table" opennebula_id="'+data.ID+'" datatable_index="'+iDisplayIndexFull+'">'+
               '<li class="provision-title text-left" title="'+data.NAME+'">'+
                 data.NAME +
               '</li>'+
@@ -193,8 +192,6 @@ define(function(require) {
       }
     });
 
-    provision_templates_datatable.fnFilter("^(?!\-$)", 2, true, false);
-
     $('.provision_list_templates_search', context).on('input',function(){
       provision_templates_datatable.fnFilter( $(this).val() );
     })
@@ -212,9 +209,9 @@ define(function(require) {
 
     $(".provision_list_templates_filter", context).on("change", ".resource_list_select", function(){
       if ($(this).val() != "-2"){
-        provision_templates_datatable.fnFilter("^" + $(this).val() + "$", 3, true, false);
+        provision_templates_datatable.fnFilter("^" + $(this).val() + "$", 2, true, false);
       } else {
-        provision_templates_datatable.fnFilter("", 3);
+        provision_templates_datatable.fnFilter("", 2);
       }
     })