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

完善模型管理

Browse Source
This commit is contained in:
molong
2017-06-19 13:59:36 +08:00
parent 250f6ea95d
commit e3b690efc2
12 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,11 +196,13 @@ class Content extends Admin {
}
//获得数组的第一条数组
$first_key = array_keys($field_group);
$rows = model('Attribute')->where($map)->order('group_id asc, sort asc')->select();
$rows = model('Attribute')->getFieldlist($map, 'id');
if (!empty($rows)) {
foreach ($rows as $key => $value) {
$fields[$field_group[$value['group_id']]][] = $value;
$list[$value['group_id']][] = $value;
}
foreach ($field_group as $key => $value) {
$fields[$value] = isset($list[$key]) ? $list[$key] : array();
}
}else{
$fields = array();

8
application/admin/controller/Model.php
View File

@@ -53,7 +53,7 @@ class Model extends Admin {
action_log('add_model', 'model', $result, session('auth_user.uid'));
$this->success('创建成功！', url('admin/model/index'));
}else{
return $this->error($this->model->getError());
return $this->error($this->model->getError() ? $this->model->getError() : '模型标识为保留名称！');
}
}else{
$this->setMeta('新增模型');
@@ -78,12 +78,16 @@ class Model extends Admin {
}else{
$info = $this->model->where('id', $request->param('id'))->find();
$field_group = parse_config_attr($info['attribute_group']);
//获取字段列表
$rows = db('Attribute')->where('model_id', $request->param('id'))->where('is_show', 1)->order('group_id asc, sort asc')->select();
if ($rows) {
// 梳理属性的可见性
foreach ($rows as $key => $field) {
$fields[$field['group_id']][] = $field;
$list[$field['group_id']][] = $field;
}
foreach ($field_group as $key => $value) {
$fields[$value] = isset($list[$key]) ? $list[$key] : array();
}
}else{
$fields = array();