fix redirect back users crud
This commit is contained in:
@@ -23,32 +23,19 @@ class UsersController extends Controller
|
|||||||
return $this->resSuccess($users);
|
return $this->resSuccess($users);
|
||||||
}
|
}
|
||||||
public function index(Request $request){
|
public function index(Request $request){
|
||||||
$menuId = $request->query('menu_id');
|
$menuId = $request->query('menu_id') ?? $request->input('menu_id');
|
||||||
$user = Auth::user();
|
$permissions = $this->permissions[$menuId]?? []; // Avoid undefined index error
|
||||||
$userId = $user->id;
|
$creator = $permissions['allow_create'] ?? 0;
|
||||||
|
$updater = $permissions['allow_update'] ?? 0;
|
||||||
// Ambil role_id yang dimiliki user
|
$destroyer = $permissions['allow_destroy'] ?? 0;
|
||||||
$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;
|
|
||||||
|
|
||||||
$users = User::paginate();
|
$users = User::paginate();
|
||||||
return view('master.users.index', compact('users', 'creator', 'updater', 'destroyer'));
|
return view('master.users.index', compact('users', 'creator', 'updater', 'destroyer','menuId'));
|
||||||
}
|
}
|
||||||
public function create(){
|
public function create(Request $request){
|
||||||
|
$menuId = $request->query('menu_id') ?? $request->input('menu_id');
|
||||||
$roles = Role::all();
|
$roles = Role::all();
|
||||||
return view('master.users.create', compact('roles'));
|
return view('master.users.create', compact('roles', 'menuId'));
|
||||||
}
|
}
|
||||||
public function store(UsersRequest $request){
|
public function store(UsersRequest $request){
|
||||||
$request->validate([
|
$request->validate([
|
||||||
@@ -86,10 +73,11 @@ class UsersController extends Controller
|
|||||||
$user = User::find($id);
|
$user = User::find($id);
|
||||||
return view('master.users.show', compact('user'));
|
return view('master.users.show', compact('user'));
|
||||||
}
|
}
|
||||||
public function edit($id){
|
public function edit(Request $request, $id){
|
||||||
|
$menuId = $request->query('menu_id') ?? $request->input('menu_id');
|
||||||
$user = User::find($id);
|
$user = User::find($id);
|
||||||
$roles = Role::all();
|
$roles = Role::all();
|
||||||
return view('master.users.edit', compact('user', 'roles'));
|
return view('master.users.edit', compact('user', 'roles', 'menuId'));
|
||||||
}
|
}
|
||||||
public function update(Request $request, $id){
|
public function update(Request $request, $id){
|
||||||
$user = User::find($id);
|
$user = User::find($id);
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
document.addEventListener("DOMContentLoaded", function (e) {
|
document.addEventListener("DOMContentLoaded", function (e) {
|
||||||
const toastNotification = document.getElementById("toastNotification");
|
const toastNotification = document.getElementById("toastNotification");
|
||||||
const toast = new bootstrap.Toast(toastNotification);
|
const toast = new bootstrap.Toast(toastNotification);
|
||||||
|
let menuId = document.getElementById("menuId").value;
|
||||||
document
|
document
|
||||||
.getElementById("btnCreateUsers")
|
.getElementById("btnCreateUsers")
|
||||||
.addEventListener("click", async function () {
|
.addEventListener("click", async function () {
|
||||||
@@ -45,7 +46,7 @@ document.addEventListener("DOMContentLoaded", function (e) {
|
|||||||
result.message;
|
result.message;
|
||||||
toast.show();
|
toast.show();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.location.href = "/master/users";
|
window.location.href = `/master/users?menu_id=${menuId}`;
|
||||||
}, 2000);
|
}, 2000);
|
||||||
} else {
|
} else {
|
||||||
let error = await response.json();
|
let error = await response.json();
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ document.addEventListener("DOMContentLoaded", function (e) {
|
|||||||
let toast = new bootstrap.Toast(
|
let toast = new bootstrap.Toast(
|
||||||
document.getElementById("toastNotification")
|
document.getElementById("toastNotification")
|
||||||
);
|
);
|
||||||
|
let menuId = document.getElementById("menuId").value;
|
||||||
submitButton.addEventListener("click", async function () {
|
submitButton.addEventListener("click", async function () {
|
||||||
let submitButton = this;
|
let submitButton = this;
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ document.addEventListener("DOMContentLoaded", function (e) {
|
|||||||
toastMessage.innerText = result.message;
|
toastMessage.innerText = result.message;
|
||||||
toast.show();
|
toast.show();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.location.href = "/master/users";
|
window.location.href = `/master/users?menu_id=${menuId}`;
|
||||||
}, 2000);
|
}, 2000);
|
||||||
} else {
|
} else {
|
||||||
let error = await response.json();
|
let error = await response.json();
|
||||||
|
|||||||
@@ -9,9 +9,8 @@ class UsersTable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
initTableUsers() {
|
initTableUsers() {
|
||||||
let tableContainer = document.getElementById(
|
let tableContainer = document.getElementById("table-users");
|
||||||
"table-users"
|
let menuId = tableContainer.getAttribute("data-menuId");
|
||||||
);
|
|
||||||
|
|
||||||
tableContainer.innerHTML = "";
|
tableContainer.innerHTML = "";
|
||||||
let canUpdate = tableContainer.getAttribute("data-updater") === "1";
|
let canUpdate = tableContainer.getAttribute("data-updater") === "1";
|
||||||
@@ -26,13 +25,15 @@ class UsersTable {
|
|||||||
"Roles",
|
"Roles",
|
||||||
{
|
{
|
||||||
name: "Action",
|
name: "Action",
|
||||||
formatter: (cell) =>{
|
formatter: (cell) => {
|
||||||
if (!canUpdate) {
|
if (!canUpdate) {
|
||||||
return gridjs.html(`<span class="text-muted">No Privilege</span>`);
|
return gridjs.html(
|
||||||
|
`<span class="text-muted">No Privilege</span>`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return gridjs.html(`
|
return gridjs.html(`
|
||||||
<div class="d-flex justify-content-center">
|
<div class="d-flex justify-content-center">
|
||||||
<a href="/master/users/${cell}/edit" class="btn btn-yellow btn-sm d-inline-flex align-items-center justify-content-center">
|
<a href="/master/users/${cell}/edit?menu_id=${menuId}" class="btn btn-yellow btn-sm d-inline-flex align-items-center justify-content-center">
|
||||||
<i class='bx bx-edit'></i>
|
<i class='bx bx-edit'></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -5,12 +5,13 @@
|
|||||||
@include('layouts.partials/page-title', ['title' => 'Users', 'subtitle' => 'Create'])
|
@include('layouts.partials/page-title', ['title' => 'Users', 'subtitle' => 'Create'])
|
||||||
|
|
||||||
<x-toast-notification />
|
<x-toast-notification />
|
||||||
|
<input type="hidden" id="menuId" value="{{ $menuId ?? 0 }}">
|
||||||
<div class="row d-flex justify-content-center">
|
<div class="row d-flex justify-content-center">
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div class="d-flex justify-content-end">
|
<div class="d-flex justify-content-end">
|
||||||
<a href="{{ route('users.index') }}" class="btn btn-sm btn-secondary me-2">Back</a>
|
<a href="{{ route('users.index', ['menu_id' => $menuId]) }}" class="btn btn-sm btn-secondary me-2">Back</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|||||||
@@ -5,12 +5,13 @@
|
|||||||
@include('layouts.partials/page-title', ['title' => 'Users', 'subtitle' => 'Create'])
|
@include('layouts.partials/page-title', ['title' => 'Users', 'subtitle' => 'Create'])
|
||||||
|
|
||||||
<x-toast-notification />
|
<x-toast-notification />
|
||||||
|
<input type="hidden" id="menuId" value="{{ $menuId ?? 0 }}">
|
||||||
<div class="row d-flex justify-content-center">
|
<div class="row d-flex justify-content-center">
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div class="d-flex justify-content-end">
|
<div class="d-flex justify-content-end">
|
||||||
<a href="{{ route('users.index') }}" class="btn btn-sm btn-secondary me-2">Back</a>
|
<a href="{{ route('users.index', ['menu_id' => $menuId]) }}" class="btn btn-sm btn-secondary me-2">Back</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|||||||
@@ -14,14 +14,15 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
|
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
|
||||||
@if ($creator)
|
@if ($creator)
|
||||||
<a href="{{ route('users.create') }}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">
|
<a href="{{ route('users.create', ['menu_id' => $menuId]) }}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">
|
||||||
Create
|
Create
|
||||||
</a>
|
</a>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
<div id="table-users"
|
<div id="table-users"
|
||||||
data-updater="{{ $updater }}"
|
data-updater="{{ $updater }}"
|
||||||
data-destroyer="{{ $destroyer }}">
|
data-destroyer="{{ $destroyer }}"
|
||||||
|
data-menuId="{{ $menuId }}">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user