Skip to content

Commit bf03292

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #27237: #26749: Saving CMS Page Title from REST web API makes content empty (by @engcom-Charlie) - #27215: Cleanup ObjectManager usage - Magento_Translation (by @Bartlomiejsz) - #27191: 26827 Added improvements to product attribute repository (save method) (by @sergiy-v) - #27125: #27124: Update wishlist image logic to match logic on wishlist page (by @mtbottens) - #23191: Refactor addlinks to own class take 3 (follows #21658) (by @amenk) - #25734: Experius 2.3 patch catalog flat (by @lewisvoncken) - #27273: MFTF: Test isolation, consistent naming (backwards-compatible) (by @lbajsarowicz) - #26015: Remove media gallery assets metadata when a directory removed (by @rogyar) Fixed GitHub Issues: - #26827: 500 when creating new product after adding attribute via API and assigning to attribute set via UI (reported by @vincentteyssier) has been fixed in #27191 by @sergiy-v in 2.4-develop branch Related commits: 1. acfc589 2. fcf734f - #27124: Share Wishlist Email: Image Logic Issue (reported by @mtbottens) has been fixed in #27125 by @mtbottens in 2.4-develop branch Related commits: 1. 854761d 2. 12ae6e5 3. 76e61ae 4. 428605d 5. b2d0793
2 parents 5112f27 + 0f323e7 commit bf03292

File tree

37 files changed

+1799
-640
lines changed

37 files changed

+1799
-640
lines changed

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ public function removeDisabledProducts(array &$ids, $storeId)
9999
['status_global_attr' => $statusAttribute->getBackendTable()],
100100
' status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
101101
. ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID
102-
. ' AND status_global_attr.' . $statusAttribute->getEntityIdField() . '='
102+
. ' AND status_global_attr.' . $metadata->getLinkField() . '='
103103
. 'product_table.' . $metadata->getLinkField(),
104104
[]
105105
);
106106
$select->joinLeft(
107107
['status_attr' => $statusAttribute->getBackendTable()],
108108
' status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
109109
. ' AND status_attr.store_id = ' . $storeId
110-
. ' AND status_attr.' . $statusAttribute->getEntityIdField() . '='
110+
. ' AND status_attr.' . $metadata->getLinkField() . '='
111111
. 'product_table.' . $metadata->getLinkField(),
112112
[]
113113
);

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
*/
66
namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
77

8+
use Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction;
89
use Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder;
910
use Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder;
1011

1112
/**
1213
* Class Rows reindex action for mass actions
13-
*
1414
*/
15-
class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
15+
class Rows extends AbstractAction
1616
{
1717
/**
1818
* @var Eraser
@@ -67,6 +67,7 @@ public function execute($ids)
6767
foreach ($idsBatches as $changedIds) {
6868
if ($tableExists) {
6969
$this->flatItemEraser->removeDeletedProducts($changedIds, $store->getId());
70+
$this->flatItemEraser->removeDisabledProducts($changedIds, $store->getId());
7071
}
7172
if (!empty($changedIds)) {
7273
$this->_reindex($store->getId(), $changedIds);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertAdminProductAttributeByCodeOnProductFormActionGroup">
12+
<annotations>
13+
<description>Requires the navigation to the Product page. Provided dropdown attribute presents on the page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productAttributeCode" type="string" defaultValue="{{textSwatchProductAttribute.attribute_code}}"/>
17+
</arguments>
18+
19+
<seeElement selector="{{AdminProductAttributesSection.attributeDropdownByCode(productAttributeCode)}}" stepKey="assertAttributeIsPresentOnForm"/>
20+
</actionGroup>
21+
</actionGroups>

0 commit comments

Comments
 (0)