shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

Feature #4317: Remove any mention to saved templates in cloud view

Browse Source 
The templates tab now shows any visible template, not just
those created from a saved VM
This commit is contained in:
Carlos Martín 2016-02-18 18:13:26 +01:00
parent c26ec3c057
commit 2c88e15624
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sunstone/public/app/tabs/provision-tab/templates/list.hbs
View File

@ -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>

13
src/sunstone/public/app/tabs/provision-tab/templates/list.js
View File

@ -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);
}
})