From 6af33127ed1e75628d765a86de3006fa727adbf2 Mon Sep 17 00:00:00 2001 From: Serhii Petrychenko Date: Sat, 14 Apr 2018 15:26:25 +0000 Subject: [PATCH 1/3] The issue #6272 'Changing sample for downloadable product failure' has been fixed --- app/code/Magento/Downloadable/Model/SampleRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php index 0c7d2b96f1b53..31716c61d20b8 100644 --- a/app/code/Magento/Downloadable/Model/SampleRepository.php +++ b/app/code/Magento/Downloadable/Model/SampleRepository.php @@ -309,7 +309,7 @@ protected function updateSample( } if ($sample->getSampleType() === 'file' && $sample->getSampleFileContent() === null) { - $sample->setSampleFile($existingSample->getSampleFile()); + $existingSample->setSampleFile($sample->getSampleFile()); } $this->saveSample($product, $sample, $isGlobalScopeContent); return $existingSample->getId(); From 520ccfd6784e7356d865e6ff732367e963ebc2fd Mon Sep 17 00:00:00 2001 From: Serhii Petrychenko Date: Sun, 6 May 2018 17:07:39 +0000 Subject: [PATCH 2/3] The pull request #14706 fix for a failing API-functional test --- app/code/Magento/Downloadable/Model/SampleRepository.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php index 31716c61d20b8..e228982c8756a 100644 --- a/app/code/Magento/Downloadable/Model/SampleRepository.php +++ b/app/code/Magento/Downloadable/Model/SampleRepository.php @@ -227,7 +227,11 @@ protected function saveSample( 'title' => $sample->getTitle(), ]; - if ($sample->getSampleType() === 'file' && $sample->getSampleFile() === null) { + if ( + $sample->getSampleType() === 'file' + && $sample->getSampleFile() === null + && $sample->getSampleFileContent() !== null + ) { $sampleData['file'] = $this->jsonEncoder->encode( [ $this->fileContentUploader->upload($sample->getSampleFileContent(), 'sample'), From 9cd28e6cf459086e25f3213c850e5f1afa92e5df Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Wed, 9 May 2018 10:15:46 +0200 Subject: [PATCH 3/3] Code style fix --- app/code/Magento/Downloadable/Model/SampleRepository.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php index e228982c8756a..6cafe4cafe0ce 100644 --- a/app/code/Magento/Downloadable/Model/SampleRepository.php +++ b/app/code/Magento/Downloadable/Model/SampleRepository.php @@ -227,8 +227,7 @@ protected function saveSample( 'title' => $sample->getTitle(), ]; - if ( - $sample->getSampleType() === 'file' + if ($sample->getSampleType() === 'file' && $sample->getSampleFile() === null && $sample->getSampleFileContent() !== null ) {