Skip to content
Permalink
Browse files Browse the repository at this point in the history
Merge branch 'sw-26050/5.6/dev' into '5.6'
SW-26050 - Adjust product name rendering

See merge request shopware/5/product/shopware!534
  • Loading branch information
shyim committed May 4, 2021
2 parents abe5fe4 + abdc2b4 commit a0850ff
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 13 deletions.
20 changes: 15 additions & 5 deletions engine/Library/ExtJs/overrides/Ext.String.js
Expand Up @@ -24,19 +24,29 @@
/** @lends Ext.String */
//{block name="extjs/overrides/string"}
Ext.override(Ext.String, {
/**
* @var DOMParser _domParser
*/
_domParser: new DOMParser(),

/**
* Return the text content of the element
*
* @returns string
*/
getText: function(value) {
var me = this,
elementNode;
var me = this;

if (!value) {
return '';
}

elementNode = document.createElement('div');
elementNode.innerHTML = value;
var elementNodes = me._domParser
.parseFromString(Ext.String.format('<div>[0]</div>', value), "text/html")
.documentElement
.querySelectorAll('div');

return me._getText([elementNode]);
return me._getText(elementNodes);
},

/**
Expand Down
5 changes: 4 additions & 1 deletion themes/Backend/ExtJs/backend/article/controller/detail.js
Expand Up @@ -267,7 +267,10 @@ Ext.define('Shopware.apps.Article.controller.Detail', {
success: function(record, operation) {

var newArticle = operation.getResultSet().records[0],
message = Ext.String.format(me.snippets.saved.message, article.get('name'));
message = Ext.String.format(
me.snippets.saved.message,
Ext.String.htmlEncode(article.get('name'))
);

if (supplierNeedsReload) {
mainWindow.supplierStore.filters.clear();
Expand Down
5 changes: 4 additions & 1 deletion themes/Backend/ExtJs/backend/article/view/detail/window.js
Expand Up @@ -361,7 +361,10 @@ Ext.define('Shopware.apps.Article.view.detail.Window', {

title = me.snippets.titleNew;
if (me.article && me.article.get('id')>0) {
title = Ext.String.format(me.snippets.titleEdit, me.article.get('name'));
title = Ext.String.format(
me.snippets.titleEdit,
Ext.String.htmlEncode(me.article.get('name'))
);
}
me.setTitle(title);

Expand Down
2 changes: 1 addition & 1 deletion themes/Frontend/Bare/frontend/detail/content/header.tpl
Expand Up @@ -7,7 +7,7 @@
{* Product name *}
{block name='frontend_detail_index_name'}
<h1 class="product--title" itemprop="name">
{$sArticle.articleName}
{$sArticle.articleName|escape}
</h1>
{/block}

Expand Down
2 changes: 1 addition & 1 deletion themes/Frontend/Bare/frontend/detail/header.tpl
@@ -1,7 +1,7 @@
{extends file='frontend/index/header.tpl'}

{* Meta title *}
{block name="frontend_index_header_title"}{if $sArticle.metaTitle}{$sArticle.metaTitle|escapeHtml} | {{config name=sShopname}|escapeHtml}{else}{$sArticle.articleName} | {$smarty.block.parent}{/if}{/block}
{block name="frontend_index_header_title"}{if $sArticle.metaTitle}{$sArticle.metaTitle|escapeHtml} | {{config name=sShopname}|escapeHtml}{else}{$sArticle.articleName|escape} | {$smarty.block.parent}{/if}{/block}

{* Meta opengraph tags *}
{block name='frontend_index_header_meta_tags_opengraph'}
Expand Down
2 changes: 1 addition & 1 deletion themes/Frontend/Bare/frontend/detail/tabs/comment.tpl
Expand Up @@ -47,7 +47,7 @@
{* Review title *}
{block name="frontend_detail_tabs_rating_title"}
<div class="content--title">
{s name="DetailCommentHeader"}{/s} "{$sArticle.articleName}"
{s name="DetailCommentHeader"}{/s} "{$sArticle.articleName|escape}"
</div>
{/block}

Expand Down
6 changes: 3 additions & 3 deletions themes/Frontend/Bare/frontend/detail/tabs/description.tpl
Expand Up @@ -19,7 +19,7 @@
{* Headline *}
{block name='frontend_detail_description_title'}
<div class="content--title">
{s name="DetailDescriptionHeader"}{/s} "{$sArticle.articleName}"
{s name="DetailDescriptionHeader"}{/s} "{$sArticle.articleName|escape}"
</div>
{/block}

Expand Down Expand Up @@ -59,7 +59,7 @@
{* Further links title *}
{block name='frontend_detail_description_links_title'}
<div class="content--title">
{s name="ArticleTipMoreInformation"}{/s} "{$sArticle.articleName}"
{s name="ArticleTipMoreInformation"}{/s} "{$sArticle.articleName|escape}"
</div>
{/block}

Expand Down Expand Up @@ -148,7 +148,7 @@
{* Comment title *}
{block name='frontend_detail_description_our_comment_title'}
<div class="content--title">
{s name='DetailDescriptionComment'}{/s} "{$sArticle.articleName}"
{s name='DetailDescriptionComment'}{/s} "{$sArticle.articleName|escape}"
</div>
{/block}

Expand Down

0 comments on commit a0850ff

Please sign in to comment.