TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename prepareModel to prepareQuery, deprecate prepareModel

This commit is contained in:
Ben Thomson 2018-12-30 16:25:01 +08:00
parent 26173486d3
commit b6bd643e21
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/backend/widgets/Lists.php
View File

@ -343,7 +343,7 @@ class Lists extends WidgetBase
/** /**
* Applies any filters to the model. * Applies any filters to the model.
*/ */
public function prepareModel() public function prepareQuery()
{ {
$query = $this->model->newQuery(); $query = $this->model->newQuery();
$primaryTable = $this->model->getTable(); $primaryTable = $this->model->getTable();
@ -566,16 +566,22 @@ class Lists extends WidgetBase
return $query; return $query;
} }
public function prepareModel()
{
traceLog('Method ' . __METHOD__ . '() has been deprecated, please use the ' . __CLASS__ . '::prepareQuery() method instead.');
return $this->prepareQuery();
}
/** /**
* Returns all the records from the supplied model, after filtering. * Returns all the records from the supplied model, after filtering.
* @return Collection * @return Collection
*/ */
protected function getRecords() protected function getRecords()
{ {
$model = $this->prepareModel(); $query = $this->prepareQuery();
if ($this->showTree) { if ($this->showTree) {
$records = $model->getNested(); $records = $query->getNested();
} }
elseif ($this->showPagination) { elseif ($this->showPagination) {
$method = $this->showPageNumbers ? 'paginate' : 'simplePaginate'; $method = $this->showPageNumbers ? 'paginate' : 'simplePaginate';
@ -584,10 +590,10 @@ class Lists extends WidgetBase
// Restore the last visited page from the session if available. // Restore the last visited page from the session if available.
$currentPageNumber = $this->getSession('lastVisitedPage'); $currentPageNumber = $this->getSession('lastVisitedPage');
} }
$records = $model->{$method}($this->recordsPerPage, $currentPageNumber); $records = $query->{$method}($this->recordsPerPage, $currentPageNumber);
} }
else { else {
$records = $model->get(); $records = $query->get();
} }
/** /**