diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php index c08d658dee990..b28570d786e68 100644 --- a/app/code/Magento/Ui/Component/MassAction/Filter.php +++ b/app/code/Magento/Ui/Component/MassAction/Filter.php @@ -206,7 +206,7 @@ public function getComponentRefererUrl() * * @return DataProviderInterface */ - private function getDataProvider() + public function getDataProvider() { if (!$this->dataProvider) { $component = $this->getComponent(); diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php index cdb25b903aea5..8ab846b91278a 100644 --- a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php +++ b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php @@ -67,9 +67,8 @@ public function getCsvFile() $name = md5(microtime()); $file = 'export/'. $component->getName() . $name . '.csv'; - $this->filter->prepareComponent($component); $this->filter->applySelectionOnTargetProvider(); - $dataProvider = $component->getContext()->getDataProvider(); + $dataProvider = $this->filter->getDataProvider(); $fields = $this->metadataProvider->getFields($component); $options = $this->metadataProvider->getOptions(); diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php index 111d750a0c67f..5f7311244f55c 100644 --- a/app/code/Magento/Ui/Model/Export/ConvertToXml.php +++ b/app/code/Magento/Ui/Model/Export/ConvertToXml.php @@ -132,13 +132,12 @@ public function getXmlFile() $name = md5(microtime()); $file = 'export/'. $component->getName() . $name . '.xml'; - $this->filter->prepareComponent($component); $this->filter->applySelectionOnTargetProvider(); - $component->getContext()->getDataProvider()->setLimit(0, 0); + $this->filter->getDataProvider()->setLimit(0, 0); /** @var SearchResultInterface $searchResult */ - $searchResult = $component->getContext()->getDataProvider()->getSearchResult(); + $searchResult = $this->filter->getDataProvider()->getSearchResult(); /** @var DocumentInterface[] $searchResultItems */ $searchResultItems = $searchResult->getItems();