Skip to content

Commit f7cef2b

Browse files
author
Roman Lytvynenko
committed
Merge branch 'MC-31198' of https://github.com/magento-tango/magento2ce into Tango-PR-03-17-2020-24
2 parents be49d90 + ba120b9 commit f7cef2b

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,6 @@ protected function isRowValidSample(array $rowData)
365365

366366
$sampleData = $this->prepareSampleData($rowData[static::COL_DOWNLOADABLE_SAMPLES]);
367367

368-
if ($this->sampleGroupTitle($rowData) == '') {
369-
$result = true;
370-
$this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
371-
}
372-
373368
$result = $result ?? $this->isTitle($sampleData);
374369

375370
foreach ($sampleData as $link) {
@@ -406,11 +401,6 @@ protected function isRowValidLink(array $rowData)
406401

407402
$linkData = $this->prepareLinkData($rowData[self::COL_DOWNLOADABLE_LINKS]);
408403

409-
if ($this->linksAdditionalAttributes($rowData, 'group_title', self::DEFAULT_GROUP_TITLE) == '') {
410-
$this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
411-
$result = true;
412-
}
413-
414404
$result = $result ?? $this->isTitle($linkData);
415405

416406
foreach ($linkData as $link) {

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_link_url_and_sample_url.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
->setVisibility(Visibility::VISIBILITY_BOTH)
4545
->setStatus(Status::STATUS_ENABLED)
4646
->setLinksPurchasedSeparately(true)
47-
->setLinksTitle('Links')
48-
->setSamplesTitle('Samples')
4947
->setStockData(
5048
[
5149
'qty' => 100,

0 commit comments

Comments
 (0)