Skip to content

Commit b17b105

Browse files
author
Andrii Lugovyi
committed
MAGETWO-43464: Loaded files display twice if edit downloadable product
- fix static test
1 parent f9f7c02 commit b17b105

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ public function delete(Data\ProductWebsiteLinkInterface $productWebsiteLink);
3939
* @throws \Magento\Framework\Exception\CouldNotSaveException
4040
*/
4141
public function deleteById($sku, $websiteId);
42-
}
42+
}

app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public function doesEntityHaveOverriddenUrlPathForStore($storeId, $entityId, $en
6969
* @param int $storeId
7070
* @param int $entityId
7171
* @param string $entityType
72+
* @param mixed $attributeName
7273
* @throws \InvalidArgumentException
7374
* @return bool
7475
*/

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,13 @@ protected function setUp()
6565
'Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider'
6666
);
6767

68-
$this->storeViewService = $this->getMock('Magento\CatalogUrlRewrite\Service\V1\StoreViewService', [], [], '',
69-
false);
68+
$this->storeViewService = $this->getMock(
69+
'Magento\CatalogUrlRewrite\Service\V1\StoreViewService',
70+
[],
71+
[],
72+
'',
73+
false
74+
);
7075

7176
$this->categoryUrlPathAutogeneratorObserver = (new ObjectManagerHelper($this))->getObject(
7277
'Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver',

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function getPurchasedSeparatelyAttribute()
161161
*
162162
* @return bool
163163
*/
164-
public function getProductLinksCanBePurchasedSeparately()
164+
public function isProductLinksCanBePurchasedSeparately()
165165
{
166166
return (bool) $this->getProduct()->getData('links_purchased_separately');
167167
}

app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<input type="radio" name="product[links_purchased_separately]" value="1"
4141
class="admin__control-radio"
4242
id="link-switcher1"
43-
<?php if($block->getProductLinksCanBePurchasedSeparately()): ?>
43+
<?php if($block->isProductLinksCanBePurchasedSeparately()): ?>
4444
checked="checked"
4545
<?php endif; ?>
4646
>
@@ -52,7 +52,7 @@
5252
<input type="radio" name="product[links_purchased_separately]" value="0"
5353
class="admin__control-radio"
5454
id="link-switcher0"
55-
<?php if(!$block->getProductLinksCanBePurchasedSeparately()): ?>
55+
<?php if(!$block->isProductLinksCanBePurchasedSeparately()): ?>
5656
checked="checked"
5757
<?php endif; ?>
5858
>

0 commit comments

Comments
 (0)