Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 14b3feb

Browse files
Merge pull request #56 from balajidharma/2.x-Changes
Added DTO to user
2 parents 9394929 + 58a4c1b commit 14b3feb

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎app/Http/Controllers/Admin/MenuItemController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function index(Menu $menu)
4949
public function create(Menu $menu)
5050
{
5151
$itemOptions = MenuItem::selectOptions($menu->id, null, true);
52-
$roles = Role::all()->pluck('name', 'id');
52+
$roles = Role::all()->pluck('name', 'name');
5353

5454
return Inertia::render('Admin/Menu/Item/Create', compact('menu', 'itemOptions', 'roles'));
5555
}
@@ -64,7 +64,7 @@ public function store(StoreMenuItemRequest $request, Menu $menu)
6464
$item = $menu->menuItems()->create($request->except(['roles']));
6565

6666
$roles = $request->roles ?? [];
67-
$item->assignRole(array_map('intval', $roles));
67+
$item->assignRole($roles);
6868

6969
return redirect()->route('admin.menu.item.index', $menu->id)
7070
->with('message', 'Menu Item created successfully.');
@@ -78,8 +78,8 @@ public function store(StoreMenuItemRequest $request, Menu $menu)
7878
public function edit(Menu $menu, MenuItem $item)
7979
{
8080
$itemOptions = MenuItem::selectOptions($menu->id, $item->parent_id ?? $item->id);
81-
$roles = Role::all()->pluck('name', 'id');
82-
$itemHasRoles = array_column(json_decode($item->roles, true), 'id');
81+
$roles = Role::all()->pluck('name', 'name');
82+
$itemHasRoles = array_column(json_decode($item->roles, true), 'name');
8383

8484
return Inertia::render('Admin/Menu/Item/Edit', compact('menu', 'item', 'itemOptions', 'roles', 'itemHasRoles'));
8585
}
@@ -94,7 +94,7 @@ public function update(UpdateMenuItemRequest $request, Menu $menu, MenuItem $ite
9494
$item->update($request->except(['roles']));
9595

9696
$roles = $request->roles ?? [];
97-
$item->syncRoles(array_map('intval', $roles));
97+
$item->syncRoles($roles);
9898

9999
return redirect()->route('admin.menu.item.index', $menu->id)
100100
->with('message', 'Menu Item updated successfully.');

‎app/Http/Controllers/Admin/RoleController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public function store(StoreRoleRequest $request)
9898
*/
9999
public function show(Role $role)
100100
{
101-
$permissions = Permission::all()->pluck('name', 'id');
102-
$roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');
101+
$permissions = Permission::all()->pluck('name', 'name');
102+
$roleHasPermissions = array_column(json_decode($role->permissions, true), 'name');
103103

104104
return Inertia::render('Admin/Role/Show', [
105105
'role' => $role,
@@ -115,8 +115,8 @@ public function show(Role $role)
115115
*/
116116
public function edit(Role $role)
117117
{
118-
$permissions = Permission::all()->pluck('name', 'id');
119-
$roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');
118+
$permissions = Permission::all()->pluck('name', 'name');
119+
$roleHasPermissions = array_column(json_decode($role->permissions, true), 'name');
120120

121121
return Inertia::render('Admin/Role/Edit', [
122122
'role' => $role,

‎app/Http/Controllers/Admin/UserController.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use App\Models\User;
88
use BalajiDharma\LaravelAdminCore\Actions\User\CreateUser;
99
use BalajiDharma\LaravelAdminCore\Actions\User\UpdateUser;
10-
use BalajiDharma\LaravelAdminCore\Requests\StoreUserRequest;
11-
use BalajiDharma\LaravelAdminCore\Requests\UpdateUserRequest;
10+
use BalajiDharma\LaravelAdminCore\Requests\User\StoreUserRequest;
11+
use BalajiDharma\LaravelAdminCore\Requests\User\UpdateUserRequest;
1212
use Illuminate\Http\Request;
1313
use Illuminate\Support\Facades\Auth;
1414
use Illuminate\Support\Facades\Hash;
@@ -72,7 +72,7 @@ public function index()
7272
*/
7373
public function create()
7474
{
75-
$roles = Role::all()->pluck('name', 'id');
75+
$roles = Role::all()->pluck('name', 'name');
7676

7777
return Inertia::render('Admin/User/Create', [
7878
'roles' => $roles,
@@ -86,7 +86,7 @@ public function create()
8686
*/
8787
public function store(StoreUserRequest $request, CreateUser $createUser)
8888
{
89-
$createUser->handle((object) $request->all());
89+
$createUser->handle($request->getUserData());
9090

9191
return redirect()->route('admin.user.index')
9292
->with('message', __('User created successfully.'));
@@ -100,7 +100,7 @@ public function store(StoreUserRequest $request, CreateUser $createUser)
100100
public function show(User $user)
101101
{
102102
$roles = Role::all()->pluck('name', 'id');
103-
$userHasRoles = array_column(json_decode($user->roles, true), 'id');
103+
$userHasRoles = array_column(json_decode($user->roles, true), 'name');
104104

105105
return Inertia::render('Admin/User/Show', [
106106
'user' => $user,
@@ -116,8 +116,8 @@ public function show(User $user)
116116
*/
117117
public function edit(User $user)
118118
{
119-
$roles = Role::all()->pluck('name', 'id');
120-
$userHasRoles = array_column(json_decode($user->roles, true), 'id');
119+
$roles = Role::all()->pluck('name', 'name');
120+
$userHasRoles = array_column(json_decode($user->roles, true), 'name');
121121

122122
return Inertia::render('Admin/User/Edit', [
123123
'user' => $user,
@@ -133,7 +133,7 @@ public function edit(User $user)
133133
*/
134134
public function update(UpdateUserRequest $request, User $user, UpdateUser $updateUser)
135135
{
136-
$updateUser->handle((object) $request->all(), $user);
136+
$updateUser->handle($request->getUserData(), $user);
137137

138138
return redirect()->route('admin.user.index')
139139
->with('message', __('User updated successfully.'));

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"require": {
88
"php": "^8.2",
9-
"balajidharma/laravel-admin-core": "^1.0",
9+
"balajidharma/laravel-admin-core": "^2.0",
1010
"inertiajs/inertia-laravel": "^1.0",
1111
"laravel/framework": "^11.0",
1212
"laravel/sanctum": "^4.0",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /