Bug #4173: Fix import and render of marketplace templates with xml tags

(cherry picked from commit 5f0660ef54)
This commit is contained in:
Carlos Martín committed 2015-11-23 11:43:48 +01:00
1 parent 57ca5f414b
commit fc6b452e8c
3 files changed
+22 -27

No files matched your search

@@ -28,6 +28,7 @@ define(function(require) {
var ResourceSelect = require('utils/resource-select');
var OpenNebulaImage = require('opennebula/image');
var OpenNebulaTemplate = require('opennebula/template');
var TemplateUtils = require('utils/template-utils');
/*
CONSTANTS
@@ -205,7 +206,7 @@ define(function(require) {
if (that.element['opennebula_template'] && that.element['opennebula_template'] !== "CPU=1") {
var vm_template;
try {
vm_template = JSON.parse(that.element['opennebula_template']);
vm_template = JSON.parse( TemplateUtils.htmlDecode(that.element['opennebula_template']) );
} catch (error) {
$(".market_template_result", template_context).html(
'<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
@@ -65,19 +65,9 @@ define(function(require) {
var url = this.element.links.download.href;
url = url.replace(/\/download$/, '');
var short_description = "";
if(this.element.short_description){
short_description = TemplateUtils.htmlDecode(this.element.short_description).replace(/\n/g, "<br/>");
}
var description = TemplateUtils.htmlDecode(this.element.description).replace(/\n/g, "<br/>");
return TemplateInfo({
'element': this.element,
'url': url,
'short_description': short_description,
'description': description
'url': url
});
}
@@ -27,7 +27,7 @@
</tr>
<tr>
<td class="key_td">{{tr "Name"}}</td>
<td class="value_td">{{element.name}}</td>
<td class="value_td">{{htmlDecode element.name}}</td>
</tr>
<tr>
<td class="key_td">{{tr "URL"}}</td>
@@ -37,37 +37,37 @@
</tr>
<tr>
<td class="key_td">{{tr "Publisher"}}</td>
<td class="value_td">{{element.publisher}}</td>
<td class="value_td">{{htmlDecode element.publisher}}</td>
</tr>
<tr>
<td class="key_td">{{tr "Downloads"}}</td>
<td class="value_td">{{element.downloads}}</td>
<td class="value_td">{{htmlDecode element.downloads}}</td>
</tr>
{{#if element.status}}
<tr>
<td class="key_td">{{tr "Status"}}</td>
<td class="value_td">{{element.status}}</td>
<td class="value_td">{{htmlDecode element.status}}</td>
</tr>
{{/if}}
{{#if element.tags}}
<tr>
<td class="key_td">{{tr "Tags"}}</td>
<td class="value_td">{{element.tags}}</td>
<td class="value_td">{{htmlDecode element.tags}}</td>
</tr>
{{/if}}
{{#if element.catalog}}
<tr>
<td class="key_td">{{tr "Catalog"}}</td>
<td class="value_td">{{element.catalog}}</td>
<td class="value_td">{{htmlDecode element.catalog}}</td>
</tr>
{{/if}}
<tr>
<td class="key_td">{{tr "OS"}}</td>
<td class="value_td">{{element.os-id}} {{element.os-release}}</td>
<td class="value_td">{{htmlDecode element.os-id}} {{htmlDecode element.os-release}}</td>
</tr>
<tr>
<td class="key_td">{{tr "Arch"}}</td>
<td class="value_td">{{element.os-arch}}</td>
<td class="value_td">{{htmlDecode element.os-arch}}</td>
</tr>
{{#if element.files}}
<tr>
@@ -77,17 +77,17 @@
{{/if}}
<tr>
<td class="key_td">{{tr "Hypervisor"}}</td>
<td class="value_td">{{element.hypervisor}}</td>
<td class="value_td">{{htmlDecode element.hypervisor}}</td>
</tr>
<tr>
<td class="key_td">{{tr "Format"}}</td>
<td class="value_td">{{element.format}}</td>
<td class="value_td">{{htmlDecode element.format}}</td>
</tr>
</tbody>
</table>
</div>
<div class="large-6 columns">
{{#if short_description}}
{{#if element.short_description}}
<table class="dataTable">
<thead>
<tr>
@@ -96,7 +96,9 @@
</thead>
<tbody>
<tr>
<td class="value_td">{{{short_description}}}</td>
<td class="value_td" style="white-space: pre-wrap;">
{{~htmlDecode element.short_description~}}
</td>
</tr>
</tbody>
</table>
@@ -109,7 +111,9 @@
</thead>
<tbody>
<tr>
<td class="value_td">{{{description}}}</td>
<td class="value_td" style="white-space: pre-wrap;">
{{~htmlDecode element.description~}}
</td>
</tr>
</tbody>
</table>
@@ -122,7 +126,7 @@
<tbody>
{{#each element.files}}
<tr>
<td class="value_td">{{name}}</td>
<td class="value_td">{{htmlDecode name}}</td>
<td class="value_td">{{humanizeSize "B" size}}</td>
</tr>
{{else}}
@@ -141,7 +145,7 @@
</thead>
<tbody>
<tr>
<td class="value_td"><pre>{{element.opennebula_template}}</pre></td>
<td class="value_td"><pre>{{htmlDecode element.opennebula_template}}</pre></td>
</tr>
</tbody>
</table>