From e0c328ba65fc5f36a9b5ced864c53e6a59291641 Mon Sep 17 00:00:00 2001 From: Cj Date: Tue, 10 Dec 2019 22:50:53 -0600 Subject: [PATCH 1/2] Update QuickadminMenuController.php save a few lines of code --- src/Controllers/QuickadminMenuController.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Controllers/QuickadminMenuController.php b/src/Controllers/QuickadminMenuController.php index 370974d..6547237 100644 --- a/src/Controllers/QuickadminMenuController.php +++ b/src/Controllers/QuickadminMenuController.php @@ -47,12 +47,9 @@ public function rearrange(Request $request) ->where('parent_id', null) ->orderBy('position')->get(); foreach ($menusList as $menu) { - if ($menu->children()->first() == null) { - $menu->position = $request->{'menu-' . $menu->id}; - $menu->save(); - } else { - $menu->position = $request->{'menu-' . $menu->id}; - $menu->save(); + $menu->position = $request->{'menu-' . $menu->id}; + $menu->save(); + if ($menu->children()->isEmpty()) { foreach ($menu->children as $child) { $child->position = $request->{'child-' . $child->id}; $child->parent_id = $request->{'child-parent-' . $child->id}; From 8b561dd08452c54a6e54bf3cd0224dd5e217444f Mon Sep 17 00:00:00 2001 From: Cj Date: Tue, 10 Dec 2019 22:58:02 -0600 Subject: [PATCH 2/2] Update QuickadminMenuController.php --- src/Controllers/QuickadminMenuController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/QuickadminMenuController.php b/src/Controllers/QuickadminMenuController.php index 6547237..cb59958 100644 --- a/src/Controllers/QuickadminMenuController.php +++ b/src/Controllers/QuickadminMenuController.php @@ -49,7 +49,7 @@ public function rearrange(Request $request) foreach ($menusList as $menu) { $menu->position = $request->{'menu-' . $menu->id}; $menu->save(); - if ($menu->children()->isEmpty()) { + if (!$menu->children()->isEmpty()) { foreach ($menu->children as $child) { $child->position = $request->{'child-' . $child->id}; $child->parent_id = $request->{'child-parent-' . $child->id};