molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新内核

Browse Source
This commit is contained in:
molong
2016-11-18 11:14:26 +08:00
parent 9074eb1d89
commit 860da138c9
36 changed files with 754 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/Content.php
View File

@@ -26,7 +26,7 @@ class Content extends Admin {
} else {
$this->modelInfo = $list[$model_id];
if ($this->modelInfo['extend'] > 1) {
$this->model = model($this->modelInfo['name']);
$this->model = model('Content')->extend($this->modelInfo['name']);
} else {
$this->model = model('Document')->extend($this->modelInfo['name']);
}
@@ -55,9 +55,7 @@ class Content extends Admin {
unset($map['model_id']);
}
$list = $this->model->where($map)->order($order)->paginate(15, false, array(
'query' => $this->param,
));
$list = $this->model->lists($map, $order);
$data = array(
'grid' => $grid_list,