hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!154 修复分类管理中可将父id设置为自己的错误 

Merge pull request !154 from saynone/master
pull/154/MERGE
Karson 2019-11-27 16:25:38 +08:00 committed by Gitee
parent f8714972fc a3fc3f85be
commit 014c29fcd2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/Category.php
View File

@ -102,9 +102,9 @@ class Category extends Backend
$params = $this->preExcludeFields($params); $params = $this->preExcludeFields($params);
if ($params['pid'] != $row['pid']) { if ($params['pid'] != $row['pid']) {
$childrenIds = Tree::instance()->init(collection(\app\common\model\Category::select())->toArray())->getChildrenIds($row['id']); $childrenIds = Tree::instance()->init(collection(\app\common\model\Category::select())->toArray())->getChildrenIds($row['id']， true);
if (in_array($params['pid'], $childrenIds)) { if (in_array($params['pid'], $childrenIds)) {
$this->error(__('Can not change the parent to child')); $this->error(__('Can not change the parent to child or itself'));
} }
} }

2
application/admin/lang/zh-cn/category.php
View File

@ -13,6 +13,6 @@ return [
'Updatetime' => '更新时间', 'Updatetime' => '更新时间',
'Weigh' => '权重', 'Weigh' => '权重',
'Category warmtips' => '温馨提示：栏目类型请前往<b>常规管理</b>-><b>系统配置</b>-><b>字典配置</b>中进行管理', 'Category warmtips' => '温馨提示：栏目类型请前往<b>常规管理</b>-><b>系统配置</b>-><b>字典配置</b>中进行管理',
'Can not change the parent to child' => '父组别不能是它的子组别', 'Can not change the parent to child or itself' => '父组别不能是它的子组别或它自己',
'Status' => '状态' 'Status' => '状态'
]; ];