From b0d4d4c23bd2107b497dd66d18c3988b1b343cc7 Mon Sep 17 00:00:00 2001 From: arifal Date: Wed, 12 Mar 2025 17:52:11 +0700 Subject: [PATCH] fix redirect back with params menu id --- app/Http/Controllers/MenusController.php | 66 ++++++++++++++---------- resources/js/menus/create.js | 3 +- resources/js/menus/index.js | 3 +- resources/js/menus/update.js | 3 +- resources/views/menus/create.blade.php | 3 +- resources/views/menus/edit.blade.php | 3 +- resources/views/menus/index.blade.php | 5 +- 7 files changed, 52 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/MenusController.php b/app/Http/Controllers/MenusController.php index caf8446..df475cf 100644 --- a/app/Http/Controllers/MenusController.php +++ b/app/Http/Controllers/MenusController.php @@ -6,7 +6,6 @@ use App\Http\Requests\MenuRequest; use App\Models\Menu; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Auth; class MenusController extends Controller { @@ -15,36 +14,33 @@ class MenusController extends Controller */ public function index(Request $request) { - $menuId = $request->query('menu_id'); - $user = Auth::user(); - $userId = $user->id; + $menuId = (int) $request->query('menu_id', 0); + $permissions = $this->permissions[$menuId] ?? []; // Avoid undefined index error - // Ambil role_id yang dimiliki user - $roleIds = DB::table('user_role') - ->where('user_id', $userId) - ->pluck('role_id'); + $creator = $permissions['allow_create'] ?? 0; + $updater = $permissions['allow_update'] ?? 0; + $destroyer = $permissions['allow_destroy'] ?? 0; - // Ambil data akses berdasarkan role_id dan menu_id - $roleAccess = DB::table('role_menu') - ->whereIn('role_id', $roleIds) - ->where('menu_id', $menuId) - ->first(); - - // Pastikan roleAccess tidak null sebelum mengakses properti - $creator = $roleAccess->allow_create ?? 0; - $updater = $roleAccess->allow_update ?? 0; - $destroyer = $roleAccess->allow_destroy ?? 0; - - return view('menus.index', compact('creator', 'updater', 'destroyer')); + return view('menus.index', compact('creator', 'updater', 'destroyer', 'menuId')); } /** * Show the form for creating a new resource. */ - public function create() + public function create(Request $request) { - $parent_menus = Menu::whereNull('parent_id')->get(); - return view("menus.create", compact('parent_menus')); + $menuId = $request->query('menu_id'); // Get menu_id from request + $menu = Menu::with('children')->find($menuId); // Find the menu + + // Get IDs of all child menus to exclude + $excludedIds = $menu ? $this->getChildMenuIds($menu) : [$menuId]; + + // Fetch only menus that have children and are not in the excluded list + $parent_menus = Menu::whereHas('children') + ->whereNotIn('id', $excludedIds) + ->get(); + + return view("menus.create", compact('parent_menus', 'menuId')); } /** @@ -77,11 +73,16 @@ class MenusController extends Controller /** * Show the form for editing the specified resource. */ - public function edit(string $id) + public function edit(string $id, Request $request) { - $menu = Menu::findOrFail($id); - $parent_menus = Menu::whereNull('parent_id')->where('id','!=',$id)->get(); - return view("menus.edit", compact('menu','parent_menus')); + $menuId = $request->query('menu_id'); + $menu = Menu::with('children')->find($id); + $excludedIds = $menu ? $this->getChildMenuIds($menu) : [$id]; + + $parent_menus = Menu::whereHas('children') + ->whereNotIn('id', $excludedIds) + ->get(); + return view("menus.edit", compact('menu','parent_menus', 'menuId')); } /** @@ -131,4 +132,15 @@ class MenusController extends Controller $child->delete(); } } + + private function getChildMenuIds($menu) + { + $ids = [$menu->id]; // Start with current menu ID + + foreach ($menu->children as $child) { + $ids = array_merge($ids, $this->getChildMenuIds($child)); // Recursively fetch children + } + + return $ids; + } } diff --git a/resources/js/menus/create.js b/resources/js/menus/create.js index 129004e..e8e52eb 100644 --- a/resources/js/menus/create.js +++ b/resources/js/menus/create.js @@ -6,6 +6,7 @@ class CreateMenu { initCreateMenu() { const toastNotification = document.getElementById("toastNotification"); const toast = new bootstrap.Toast(toastNotification); + let menuId = document.getElementById("menuId").value; document .getElementById("btnCreateMenus") .addEventListener("click", async function () { @@ -41,7 +42,7 @@ class CreateMenu { result.message; toast.show(); setTimeout(() => { - window.location.href = "/menus"; + window.location.href = `/menus?menu_id=${menuId}`; }, 2000); } else { let error = await response.json(); diff --git a/resources/js/menus/index.js b/resources/js/menus/index.js index 1755cd3..38dbc49 100644 --- a/resources/js/menus/index.js +++ b/resources/js/menus/index.js @@ -31,6 +31,7 @@ class Menus { tableContainer.innerHTML = ""; let canUpdate = tableContainer.getAttribute("data-updater") === "1"; let canDelete = tableContainer.getAttribute("data-destroyer") === "1"; + let menuId = tableContainer.getAttribute("data-menuId"); this.table = new Grid({ columns: [ @@ -47,7 +48,7 @@ class Menus { if (canUpdate) { buttons += ` - + `; diff --git a/resources/js/menus/update.js b/resources/js/menus/update.js index 44d53fe..5a53100 100644 --- a/resources/js/menus/update.js +++ b/resources/js/menus/update.js @@ -6,6 +6,7 @@ class UpdateMenu { initUpdateMenu() { const toastNotification = document.getElementById("toastNotification"); const toast = new bootstrap.Toast(toastNotification); + let menuId = document.getElementById("menuId").value; document .getElementById("btnUpdateMenus") .addEventListener("click", async function () { @@ -41,7 +42,7 @@ class UpdateMenu { result.message; toast.show(); setTimeout(() => { - window.location.href = "/menus"; + window.location.href = `/menus?menu_id=${menuId}`; }, 2000); } else { let error = await response.json(); diff --git a/resources/views/menus/create.blade.php b/resources/views/menus/create.blade.php index 72cd7e4..1ee2a1c 100644 --- a/resources/views/menus/create.blade.php +++ b/resources/views/menus/create.blade.php @@ -5,11 +5,12 @@ @include('layouts.partials/page-title', ['title' => 'Settings', 'subtitle' => 'Menu']) +
- Back + Back
diff --git a/resources/views/menus/edit.blade.php b/resources/views/menus/edit.blade.php index 3d6fc9b..9dcb371 100644 --- a/resources/views/menus/edit.blade.php +++ b/resources/views/menus/edit.blade.php @@ -9,11 +9,12 @@ @include('layouts.partials/page-title', ['title' => 'Settings', 'subtitle' => 'Menu']) +
- Back + Back
id)}}" method="post"> diff --git a/resources/views/menus/index.blade.php b/resources/views/menus/index.blade.php index f7ea0b4..09a03f6 100644 --- a/resources/views/menus/index.blade.php +++ b/resources/views/menus/index.blade.php @@ -17,13 +17,14 @@
@if ($creator) - Create + Create @endif
+ data-destroyer="{{ $destroyer }}" + data-menuId="{{ $menuId }}">