diff --git a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js index 0e70a429f2..5c03796a58 100644 --- a/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js +++ b/src/sunstone/public/app/tabs/marketplace-tab/dialogs/import.js @@ -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( ''+ diff --git a/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js b/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js index 92c6deaf94..f32d8a35b5 100644 --- a/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/marketplace-tab/panels/info.js @@ -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, "
"); - } - - var description = TemplateUtils.htmlDecode(this.element.description).replace(/\n/g, "
"); - return TemplateInfo({ 'element': this.element, - 'url': url, - 'short_description': short_description, - 'description': description + 'url': url }); } diff --git a/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs index e9a293701a..38a114c697 100644 --- a/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/marketplace-tab/panels/info/html.hbs @@ -27,7 +27,7 @@ {{tr "Name"}} - {{element.name}} + {{htmlDecode element.name}} {{tr "URL"}} @@ -37,37 +37,37 @@ {{tr "Publisher"}} - {{element.publisher}} + {{htmlDecode element.publisher}} {{tr "Downloads"}} - {{element.downloads}} + {{htmlDecode element.downloads}} {{#if element.status}} {{tr "Status"}} - {{element.status}} + {{htmlDecode element.status}} {{/if}} {{#if element.tags}} {{tr "Tags"}} - {{element.tags}} + {{htmlDecode element.tags}} {{/if}} {{#if element.catalog}} {{tr "Catalog"}} - {{element.catalog}} + {{htmlDecode element.catalog}} {{/if}} {{tr "OS"}} - {{element.os-id}} {{element.os-release}} + {{htmlDecode element.os-id}} {{htmlDecode element.os-release}} {{tr "Arch"}} - {{element.os-arch}} + {{htmlDecode element.os-arch}} {{#if element.files}} @@ -77,17 +77,17 @@ {{/if}} {{tr "Hypervisor"}} - {{element.hypervisor}} + {{htmlDecode element.hypervisor}} {{tr "Format"}} - {{element.format}} + {{htmlDecode element.format}}
- {{#if short_description}} + {{#if element.short_description}} @@ -96,7 +96,9 @@ - +
{{{short_description}}} + {{~htmlDecode element.short_description~}} +
@@ -109,7 +111,9 @@ - {{{description}}} + + {{~htmlDecode element.description~}} + @@ -122,7 +126,7 @@ {{#each element.files}} - {{name}} + {{htmlDecode name}} {{humanizeSize "B" size}} {{else}} @@ -141,7 +145,7 @@ -
{{element.opennebula_template}}
+
{{htmlDecode element.opennebula_template}}