minor

Author: ctf0

src/Controllers/Admin/PagesController.php

@@ -6,7 +6,6 @@
 use ctf0\SimpleMenu\Controllers\BaseController;
 use ctf0\SimpleMenu\Models\Page;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Spatie\Permission\Models\Role;
 
 class PagesController extends BaseController
@@ -118,8 +117,6 @@ public function update($id, Request $request)
     public function destroy($id)
     {
         Page::find($id)->delete();
-        DB::table('model_has_roles')->where('model_id', $id)->delete();
-        DB::table('model_has_permissions')->where('model_id', $id)->delete();
 
         $this->clearCache();
 

src/Observers/PageObserver.php

@@ -2,11 +2,11 @@
 
 namespace ctf0\SimpleMenu\Observers;
 
+use ctf0\SimpleMenu\Facade\SimpleMenu;
 use ctf0\SimpleMenu\Models\Menu;
 use ctf0\SimpleMenu\Models\Page;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
-use ctf0\SimpleMenu\Facade\SimpleMenu;
 
 class PageObserver
 {
@@ -23,6 +23,9 @@ public function saved(Page $page)
      */
     public function deleted(Page $page)
     {
+        $page->roles()->detach();
+        $page->permissions()->detach();
+
         return $this->cleanData($page);
     }
 

src/resources/assets/js/components/menu_child.vue

@@ -30,61 +30,61 @@
 </style>
 
 <script>
-    import draggable from 'vuedraggable'
+import draggable from 'vuedraggable'
 
-    export default {
-        name: 'menu-child',
-        props: ['pages', 'allPages', 'locale', 'delChild', 'childs'],
-        components: {draggable},
-        methods: {
-            deleteChild(item){
-                $.post(this.delChild,{
-                    child_id: item.id,
-                }, (res) => {
-                    if (res.done) {
-                        this.childs.splice(this.childs.indexOf(item), 1)
+export default {
+    name: 'menu-child',
+    props: ['pages', 'allPages', 'locale', 'delChild', 'childs'],
+    components: {draggable},
+    methods: {
+        deleteChild(item) {
+            $.post(this.delChild, {
+                child_id: item.id
+            }, (res) => {
+                if (res.done) {
+                    this.childs.splice(this.childs.indexOf(item), 1)
 
-                        EventHub.fire('showNotif',{
-                            title: 'Success',
-                            body: `"${this.getTitle(item.title)}" was removed`,
-                            type: 'success',
-                            duration: 3,
-                            icon: false
-                        });
+                    EventHub.fire('showNotif', {
+                        title: 'Success',
+                        body: `"${this.getTitle(item.title)}" was removed`,
+                        type: 'success',
+                        duration: 3,
+                        icon: false
+                    })
 
-                        EventHub.fire('updateAllPages')
-                        EventHub.fire('updatePagesHierarchy')
-                    }
-                })
-            },
-            getTitle(title) {
-                let locale = this.locale
-                let v = Object.keys(title).indexOf(locale)
-                return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0]
-            },
-
-            // operations
-            checkFrom(item) {
-                return item.from ? true : false;
-            },
-            undoItem(item) {
-                this.childs.splice(this.childs.indexOf(item),1)
-                this.pushBackToList(item)
-            },
-            pushBackToList(item){
-                return item.from == 'pages' ? this.pages.unshift(item) : this.allPages.unshift(item)
-            },
-
-            // nests
-            hasChilds(item){
-                return item.nests && item.nests.length > 0;
-            },
-            checkAdded(e){
-                // update saveList on nest movement
-                if (e.removed || e.added && e.added.element.from == 'allPages') {
+                    EventHub.fire('updateAllPages')
                     EventHub.fire('updatePagesHierarchy')
                 }
-            }
+            })
+        },
+        getTitle(title) {
+            let locale = this.locale
+            let v = Object.keys(title).indexOf(locale)
+            return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0]
+        },
+
+        // operations
+        checkFrom(item) {
+            return item.from ? true : false
         },
+        undoItem(item) {
+            this.childs.splice(this.childs.indexOf(item), 1)
+            this.pushBackToList(item)
+        },
+        pushBackToList(item) {
+            return item.from == 'pages' ? this.pages.unshift(item) : this.allPages.unshift(item)
+        },
+
+        // nests
+        hasChilds(item) {
+            return item.nests && item.nests.length > 0
+        },
+        checkAdded(e) {
+            // update saveList on nest movement
+            if (e.moved || e.removed || e.added && e.added.element.from == 'allPages') {
+                EventHub.fire('updatePagesHierarchy')
+            }
+        }
     }
+}
 </script>