File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed
app/code/Magento/Ui/Component Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -188,7 +188,7 @@ protected function getDataFromDataProvider(array $dataRow)
188
188
public function getCollectionItems ()
189
189
{
190
190
$ items = [];
191
- $ collection = $ this ->getDataCollection ()-> getResultCollection () ;
191
+ $ collection = $ this ->getDataCollection ();
192
192
foreach ($ collection ->getItems () as $ item ) {
193
193
$ actualFields = [];
194
194
$ itemsData = $ this ->getDataFromDataProvider ($ item ->getData ());
@@ -230,8 +230,8 @@ protected function initialConfiguration()
230
230
);
231
231
$ this ->renderContext ->getStorage ()->addGlobalData ('dump ' , ['extenders ' => []]);
232
232
233
- $ collection = $ this ->getDataCollection ()-> getResultCollection () ;
234
- $ totalCount = $ collection ->getTotalCount ();
233
+ $ collection = $ this ->getDataCollection ();
234
+ $ totalCount = $ collection ->count ();
235
235
$ this ->renderContext ->getStorage ()->addDataSource (
236
236
$ this ->getName (),
237
237
[
Original file line number Diff line number Diff line change @@ -37,7 +37,10 @@ protected function updateDataCollection()
37
37
$ offset = $ this ->renderContext ->getRequestParam ('page ' , $ defaultPage );
38
38
$ defaultLimit = $ this ->config ->getData ('pageSize ' );
39
39
$ size = $ this ->renderContext ->getRequestParam ('limit ' , $ defaultLimit );
40
- $ this ->renderContext ->getStorage ()->getDataCollection ($ this ->getParentName ())->setLimit ($ offset , $ size );
40
+ $ this ->renderContext ->getStorage ()
41
+ ->getDataCollection ($ this ->getParentName ())
42
+ ->setPageSize ($ size )
43
+ ->setCurPage ($ offset );
41
44
}
42
45
43
46
/**
You can’t perform that action at this time.
0 commit comments