Skip to content

Commit 5c00973

Browse files
pradeep1819pradeep1819
committed
ACP2E-3058: Missing label in LayeredNavigation with option name 0
1 parent b0c49b2 commit 5c00973

File tree

2 files changed

+41
-30
lines changed
  • app
    • code/Magento/LayeredNavigation/view/frontend/templates/layer
    • design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer

2 files changed

+41
-30
lines changed

‎app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,46 @@
88
/**
99
* Category layered navigation state
1010
*
11+
* @var $escaper \Magento\Framework\Escaper
1112
* @var $block \Magento\LayeredNavigation\Block\Navigation\State
1213
*/
1314
?>
1415
<?php $_filters = $block->getActiveFilters() ?>
15-
<?php if (!empty($_filters)) : ?>
16+
<?php if (!empty($_filters)): ?>
1617
<div class="filter-current">
1718
<strong class="block-subtitle filter-current-subtitle"
1819
role="heading"
1920
aria-level="2"
20-
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
21+
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?>
22+
</strong>
2123
<ol class="items">
22-
<?php foreach ($_filters as $_filter) : ?>
24+
<?php foreach ($_filters as $_filter): ?>
2325
<li class="item">
24-
<span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
25-
<span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
26+
<span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
27+
<span class="filter-value">
28+
<?= ((string)$_filter->getLabel() === "0") ? $escaper->escapeHtml($_filter->getLabel()) :
29+
$escaper->escapeHtml($block->stripTags($_filter->getLabel())) ?>
30+
</span>
2631
<?php
2732
$clearLinkUrl = $_filter->getClearLinkUrl();
28-
$currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
29-
if ($clearLinkUrl) :
33+
$currentFilterName = $escaper->escapeHtmlAttr(
34+
__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel())
35+
);
36+
if ($clearLinkUrl):
3037
?>
31-
<a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
32-
title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
33-
<span><?= $block->escapeHtml(__('Previous')) ?></span>
38+
<a class="action previous" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
39+
title="<?= $escaper->escapeHtmlAttr(__('Previous')) ?>">
40+
<span><?= $escaper->escapeHtml(__('Previous')) ?></span>
3441
</a>
3542
<a class="action remove"
36-
title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
37-
href="<?= $block->escapeUrl($clearLinkUrl) ?>">
38-
<span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
43+
title="<?= $escaper->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
44+
href="<?= $escaper->escapeUrl($clearLinkUrl) ?>">
45+
<span><?= $escaper->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
3946
</a>
40-
<?php else : ?>
41-
<a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
42-
title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
43-
<span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
47+
<?php else: ?>
48+
<a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
49+
title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
50+
<span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
4451
</a>
4552
<?php endif; ?>
4653
</li>

‎app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/**
1111
* Category layered navigation state
1212
*
13+
* @var $escaper \Magento\Framework\Escaper
1314
* @var $block \Magento\LayeredNavigation\Block\Navigation\State
1415
*/
1516
?>
@@ -20,30 +21,33 @@
2021
role="heading"
2122
aria-level="2"
2223
data-role="title"
23-
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
24+
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?></strong>
2425
<ol class="items">
2526
<?php foreach ($_filters as $_filter): ?>
2627
<li class="item">
27-
<span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
28-
<span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
28+
<span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
29+
<span class="filter-value">
30+
<?= ((string)$_filter->getLabel() === "0") ? $escaper->escapeHtml($_filter->getLabel()) :
31+
$escaper->escapeHtml($block->stripTags($_filter->getLabel())) ?>
32+
</span>
2933
<?php
3034
$clearLinkUrl = $_filter->getClearLinkUrl();
31-
$currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
35+
$currentFilterName = $escaper->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
3236
if ($clearLinkUrl):
3337
?>
34-
<a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
35-
title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
36-
<span><?= $block->escapeHtml(__('Previous')) ?></span>
38+
<a class="action previous" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
39+
title="<?= $escaper->escapeHtmlAttr(__('Previous')) ?>">
40+
<span><?= $escaper->escapeHtml(__('Previous')) ?></span>
3741
</a>
3842
<a class="action remove"
39-
title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
40-
href="<?= $block->escapeUrl($clearLinkUrl) ?>">
41-
<span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
43+
title="<?= $escaper->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
44+
href="<?= $escaper->escapeUrl($clearLinkUrl) ?>">
45+
<span><?= $escaper->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
4246
</a>
4347
<?php else: ?>
44-
<a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
45-
title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
46-
<span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
48+
<a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
49+
title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
50+
<span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
4751
</a>
4852
<?php endif; ?>
4953
</li>

0 commit comments

Comments
 (0)