Merge pull request #1659 from z-song/1.5

1.5
z-song · Jan 23, 2018 · 4fd32e4 · 4fd32e4
2 parents c1b3895 + 512d9a0
commit 4fd32e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Auth/Database/Menu.php b/src/Auth/Database/Menu.php
@@ -17,7 +17,9 @@
  */
 class Menu extends Model
 {
-    use ModelTree, AdminBuilder;
+    use AdminBuilder, ModelTree {
+        ModelTree::boot as treeBoot;
+    }
 
     /**
      * The attributes that are mass assignable.
@@ -74,7 +76,7 @@ public function allNodes() : array
      */
     protected static function boot()
     {
-        parent::boot();
+        static::treeBoot();
 
         static::deleting(function ($model) {
             $model->roles()->detach();

diff --git a/src/Controllers/MenuController.php b/src/Controllers/MenuController.php
@@ -40,6 +40,7 @@ public function index()
                     $form->icon('icon', trans('admin.icon'))->default('fa-bars')->rules('required')->help($this->iconHelp());
                     $form->text('uri', trans('admin.uri'));
                     $form->multipleSelect('roles', trans('admin.roles'))->options(Role::all()->pluck('name', 'id'));
+                    $form->hidden('_token')->default(csrf_token());
 
                     $column->append((new Box(trans('admin.new'), $form))->style('success'));
                 });