From 3c1d647b486f4eb35ac73cd45155dddb8b109f72 Mon Sep 17 00:00:00 2001
From: z-song <zosong@126.com>
Date: Tue, 23 Jan 2018 13:15:13 +0800
Subject: [PATCH 1/2] fix issue #1653

---
 src/Auth/Database/Menu.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Auth/Database/Menu.php b/src/Auth/Database/Menu.php
index eb983e9935..8508e4d331 100644
--- 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();

From 512d9a004a357c6227a9673b51a8ad85137c2a7e Mon Sep 17 00:00:00 2001
From: z-song <zosong@126.com>
Date: Tue, 23 Jan 2018 13:39:15 +0800
Subject: [PATCH 2/2] fix issue #1651

---
 src/Controllers/MenuController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Controllers/MenuController.php b/src/Controllers/MenuController.php
index 499a544d89..dbcf0d1f60 100644
--- 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'));
                 });