diff --git a/app/Http/Controllers/Data/AdvertisementController.php b/app/Http/Controllers/Data/AdvertisementController.php index d95c9bd..0adae63 100644 --- a/app/Http/Controllers/Data/AdvertisementController.php +++ b/app/Http/Controllers/Data/AdvertisementController.php @@ -15,7 +15,7 @@ class AdvertisementController extends Controller */ public function index(Request $request) { - $menuId = (int) $request->query('menu_id', 0); + $menuId = $request->query('menu_id', 0); $permissions = $this->permissions[$menuId] ?? []; // Avoid undefined index error $creator = $permissions['allow_create'] ?? 0; @@ -39,7 +39,7 @@ class AdvertisementController extends Controller */ public function create(Request $request) { - $menuId = (int) $request->query('menu_id', 0); + $menuId = $request->query('menu_id', 0); $title = 'Advertisement'; $subtitle = 'Create Data'; @@ -64,7 +64,7 @@ class AdvertisementController extends Controller */ public function edit(Request $request, $id) { - $menuId = (int) $request->query('menu_id', 0); + $menuId = $request->query('menu_id', 0); info("AdvertisementController@edit diakses dengan ID: $id"); $title = 'Advertisement'; $subtitle = 'Update Data'; diff --git a/app/Http/Controllers/Data/TourismController.php b/app/Http/Controllers/Data/TourismController.php index 0809eef..035b69f 100644 --- a/app/Http/Controllers/Data/TourismController.php +++ b/app/Http/Controllers/Data/TourismController.php @@ -15,41 +15,30 @@ class TourismController extends Controller */ public function index(Request $request) { - $menuId = $request->query('menu_id'); - $user = Auth::user(); - $userId = $user->id; + $menuId = $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'); - - // 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('data.tourisms.index', compact('creator', 'updater', 'destroyer')); + $creator = $permissions['allow_create'] ?? 0; + $updater = $permissions['allow_update'] ?? 0; + $destroyer = $permissions['allow_destroy'] ?? 0; + return view('data.tourisms.index', compact('creator', 'updater', 'destroyer', 'menuId')); } /** * show the form for creating a new rsource. */ - public function bulkCreate() + public function bulkCreate(Request $request) { - return view('data.tourisms.form-upload'); + $menuId = $request->query('menu_id', 0); + return view('data.tourisms.form-upload', compact('menuId')); } /** * Show th form for creating a new resource */ - public function create() + public function create(Request $request) { + $menuId = $request->query('menu_id', 0); $title = 'Pariwisata'; $subtitle = 'Create Data'; @@ -64,14 +53,15 @@ class TourismController extends Controller $apiUrl = url('/api/tourisms'); - return view('data.tourisms.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); + return view('data.tourisms.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions', 'menuId')); } /** * show the form for editing the specified resource. */ - public function edit($id) + public function edit(Request $request, $id) { + $menuId = $request->query('menu_id', 0); $title = 'Pariwisata'; $subtitle = 'Update Data'; @@ -98,7 +88,7 @@ class TourismController extends Controller $apiUrl = url('/api/tourisms'); - return view('data.tourisms.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); + return view('data.tourisms.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions', 'menuId')); } private function getFields() diff --git a/resources/js/data/advertisements/data-advertisements.js b/resources/js/data/advertisements/data-advertisements.js index b3737de..d8e066c 100644 --- a/resources/js/data/advertisements/data-advertisements.js +++ b/resources/js/data/advertisements/data-advertisements.js @@ -37,7 +37,8 @@ const dataAdvertisementsColumns = [ actionButtons += ` `; } diff --git a/resources/js/data/advertisements/form-create-update.js b/resources/js/data/advertisements/form-create-update.js index 633da45..3c55bce 100644 --- a/resources/js/data/advertisements/form-create-update.js +++ b/resources/js/data/advertisements/form-create-update.js @@ -6,6 +6,7 @@ document.addEventListener("DOMContentLoaded", function () { const form = document.querySelector("form#create-update-form"); var authLogo = document.querySelector(".auth-logo"); let menuId = document.getElementById("menuId").value; + console.log(menuId); if (!saveButton || !form) return; diff --git a/resources/js/data/advertisements/form-upload.js b/resources/js/data/advertisements/form-upload.js index 61f05a1..816de12 100644 --- a/resources/js/data/advertisements/form-upload.js +++ b/resources/js/data/advertisements/form-upload.js @@ -28,6 +28,7 @@ console.log(dropzonePreviewNode); .getAttribute("content")}`, }, init: function () { + let menuId = document.getElementById("menuId").value; // Listen for the success event this.on("success", function (file, response) { console.log("File successfully uploaded:", file); @@ -39,7 +40,7 @@ console.log(dropzonePreviewNode); "Upload Files"; // Tunggu sebentar lalu reload halaman setTimeout(() => { - window.location.href = "/data/web-advertisements"; + window.location.href = `/data/web-advertisements?menu_id=${menuId}`; }, 2000); }); // Listen for the error event diff --git a/resources/js/data/tourisms/data-tourisms.js b/resources/js/data/tourisms/data-tourisms.js index 7b4a809..76c2364 100644 --- a/resources/js/data/tourisms/data-tourisms.js +++ b/resources/js/data/tourisms/data-tourisms.js @@ -11,6 +11,7 @@ const tableElement = document.getElementById("tourisms-data-table"); const canView = "1"; const canUpdate = tableElement.getAttribute("data-updater") === "1"; const canDelete = tableElement.getAttribute("data-destroyer") === "1"; +let menuId = document.getElementById("menuId").value; const dataTourismsColumns = [ "No", @@ -32,7 +33,7 @@ const dataTourismsColumns = [ const district = row.cells[4].data; const long = row.cells[9].data; const lat = row.cells[10].data; - const model = "data/tourisms"; + const model = "data/web-tourisms"; let actionButtons = '