Skip to content

Commit 0ba233a

Browse files
MAGETWO-86429: [Backport to 2.1-develop] Attribute with 'Catalog Input Type for Store Owner' equal 'Fixed Product Tax' for Multi-store #13020
- Merge Pull Request #13020 from dverkade/magento2:2.1-Attribute-with-Catalog-Input-Type-for-Store-Owner - Merged commits: 1. 31c1939 2. 2502f84
2 parents d1416b0 + 2502f84 commit 0ba233a

File tree

1 file changed

+2
-3
lines changed
  • app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager

1 file changed

+2
-3
lines changed

app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ public function getWebsites(ProductInterface $product, EavAttribute $eavAttribut
6767
return $this->websites = $websites;
6868
}
6969

70-
7170
if ($storeId = $this->locator->getStore()->getId()) {
7271
/** @var WebsiteInterface $website */
7372
$website = $this->storeManager->getStore($storeId)->getWebsite();
74-
$websites[$website->getId()] = [
73+
$websites[] = [
7574
'value' => $website->getId(),
7675
'label' => $this->formatLabel(
7776
$website->getName(),
@@ -84,7 +83,7 @@ public function getWebsites(ProductInterface $product, EavAttribute $eavAttribut
8483
if (!in_array($website->getId(), $product->getWebsiteIds())) {
8584
continue;
8685
}
87-
$websites[$website->getId()] = [
86+
$websites[] = [
8887
'value' => $website->getId(),
8988
'label' => $this->formatLabel(
9089
$website->getName(),

0 commit comments

Comments
 (0)