Skip to content

Commit 192e28a

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #21175: Added translation for comment tag (by @yogeshsuhagiya) - #21301: span tag for more swatches link (by @mageho) - #21265: Backend Module Manager disable icon fix. (by @speedy008) - #20971: Cast attribute ID to integer - Fixes #20969 (by @k4emic) Fixed GitHub Issues: - #20969: Poor performance for some layered navigation queries (reported by @k4emic) has been fixed in #20971 by @k4emic in 2.3-develop branch Related commits: 1. c5c5e41 2. 77b0ae8
2 parents 936a849 + 5c1d771 commit 192e28a

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ public function __construct(
7474
}
7575

7676
/**
77+
* Build select for attribute search
78+
*
7779
* @param Select $select
7880
* @param AbstractAttribute $attribute
7981
* @param int $currentScope
@@ -101,7 +103,7 @@ public function build(Select $select, AbstractAttribute $attribute, int $current
101103
$subSelect = $select;
102104
$subSelect->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
103105
->distinct()
104-
->where('main_table.attribute_id = ?', $attribute->getAttributeId())
106+
->where('main_table.attribute_id = ?', (int) $attribute->getAttributeId())
105107
->where('main_table.store_id = ? ', $currentScopeId);
106108
if ($this->isAddStockFilter()) {
107109
$subSelect = $this->applyStockConditionToSelect->execute($subSelect);
@@ -116,6 +118,8 @@ public function build(Select $select, AbstractAttribute $attribute, int $current
116118
}
117119

118120
/**
121+
* Is add stock filter
122+
*
119123
* @return bool
120124
*/
121125
private function isAddStockFilter()

app/code/Magento/Msrp/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<section id="sales">
1111
<group id="msrp" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
1212
<label>Minimum Advertised Price</label>
13-
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
13+
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
1414
<label>Enable MAP</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
<comment>

app/code/Magento/Msrp/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Price,Price
1313
"Add to Cart","Add to Cart"
1414
"Minimum Advertised Price","Minimum Advertised Price"
1515
"Enable MAP","Enable MAP"
16+
"<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.","<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront."
1617
"Display Actual Price","Display Actual Price"
1718
"Default Popup Text Message","Default Popup Text Message"
1819
"Default ""What's This"" Text Message","Default ""What's This"" Text Message"

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ define([
511511

512512
// Add more button
513513
if (moreLimit === countAttributes++) {
514-
html += '<a href="#" class="' + moreClass + '">' + moreText + '</a>';
514+
html += '<a href="#" class="' + moreClass + '"><span>' + moreText + '</span></a>';
515515
}
516516

517517
id = this.id;

setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)