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

修复删除父规则节点时未删除子节点的BUG 

修复CRUD默认index视图的错误
pull/269678/MERGE
Karson 2017-04-20 22:02:44 +08:00
parent 0b13e1efe3
commit 3320cec110
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/command/Crud/stubs/index.stub
View File

@ -1,5 +1,5 @@
<div class="panel panel-default panel-intro"> <div class="panel panel-default panel-intro">
{:build_heading($heading.name, $heading.intro)} {:build_heading()}
<div class="panel-body"> <div class="panel-body">
<div id="myTabContent" class="tab-content"> <div id="myTabContent" class="tab-content">

8
application/admin/controller/auth/Rule.php
View File

@ -107,7 +107,13 @@ class Rule extends Backend
$this->code = -1; $this->code = -1;
if ($ids) if ($ids)
{ {
$count = $this->model->where('id', 'in', $ids)->delete(); $delIds = [];
foreach (explode(',', $ids) as $k => $v)
{
$delIds = array_merge($delIds, Tree::instance()->getChildrenIds($v, TRUE));
}
$delIds = array_unique($delIds);
$count = $this->model->where('id', 'in', $delIds)->delete();
if ($count) if ($count)
{ {
AdminLog::record(__('Del'), $ids); AdminLog::record(__('Del'), $ids);