mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Replace deprecated prepareModel call in ImportExport behavior

Browse Source
This commit is contained in:
Ben Thomson 2018-12-30 16:35:17 +08:00
parent b6bd643e21
commit 63dfb7fad3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/behaviors/ImportExportController.php
View File

@ -210,7 +210,7 @@ class ImportExportController extends ControllerBehavior
catch (Exception $ex) {
$this->controller->handleError($ex);
}
$this->vars['sourceIndexOffset'] = $this->getImportSourceIndexOffset($importOptions['firstRowTitles']);
return $this->importExportMakePartial('import_result_form');
@ -334,7 +334,7 @@ class ImportExportController extends ControllerBehavior
return $firstRow;
}
/**
* Get the index offset to add to the reported row number in status messages
*
@ -627,8 +627,8 @@ class ImportExportController extends ControllerBehavior
? 'getColumnValueRaw'
: 'getColumnValue';
$model = $widget->prepareModel();
$results = $model->get();
$query = $widget->prepareQuery();
$results = $query->get();
foreach ($results as $result) {
$record = [];
foreach ($columns as $column) {