fix redirect back users crud
This commit is contained in:
@@ -23,32 +23,19 @@ class UsersController extends Controller
|
||||
return $this->resSuccess($users);
|
||||
}
|
||||
public function index(Request $request){
|
||||
$menuId = $request->query('menu_id');
|
||||
$user = Auth::user();
|
||||
$userId = $user->id;
|
||||
|
||||
// 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;
|
||||
$menuId = $request->query('menu_id') ?? $request->input('menu_id');
|
||||
$permissions = $this->permissions[$menuId]?? []; // Avoid undefined index error
|
||||
$creator = $permissions['allow_create'] ?? 0;
|
||||
$updater = $permissions['allow_update'] ?? 0;
|
||||
$destroyer = $permissions['allow_destroy'] ?? 0;
|
||||
|
||||
$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();
|
||||
return view('master.users.create', compact('roles'));
|
||||
return view('master.users.create', compact('roles', 'menuId'));
|
||||
}
|
||||
public function store(UsersRequest $request){
|
||||
$request->validate([
|
||||
@@ -86,10 +73,11 @@ class UsersController extends Controller
|
||||
$user = User::find($id);
|
||||
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);
|
||||
$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){
|
||||
$user = User::find($id);
|
||||
|
||||
Reference in New Issue
Block a user