Skip to content

Commit f094d8f

Browse files
authored
Merge pull request #69 from balajidharma/2.x-Changes
Issue #68 - Fixed
2 parents 8ef205a + 71fcd95 commit f094d8f

File tree

9 files changed

+13
-12
lines changed

9 files changed

+13
-12
lines changed

app/Providers/AuthServiceProvider.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ class AuthServiceProvider extends ServiceProvider
1616
'App\Models\Role' => 'BalajiDharma\LaravelAdminCore\Policies\RolePolicy',
1717
'App\Models\Permission' => 'BalajiDharma\LaravelAdminCore\Policies\PermissionPolicy',
1818
'App\Models\User' => 'BalajiDharma\LaravelAdminCore\Policies\UserPolicy',
19-
'BalajiDharma\LaravelCategory\Models\Category' => 'BalajiDharma\LaravelCategory\Policies\CategoryPolicy',
20-
'BalajiDharma\LaravelCategory\Models\CategoryType' => 'BalajiDharma\LaravelCategory\Policies\CategoryTypePolicy',
21-
'BalajiDharma\LaravelMenu\Models\Menu' => 'BalajiDharma\LaravelMenu\Policies\MenuPolicy',
22-
'BalajiDharma\LaravelMenu\Models\MenuItem' => 'BalajiDharma\LaravelMenu\Policies\MenuItemPolicy',
19+
'BalajiDharma\LaravelCategory\Models\Category' => 'BalajiDharma\LaravelAdminCore\Policies\CategoryPolicy',
20+
'BalajiDharma\LaravelCategory\Models\CategoryType' => 'BalajiDharma\LaravelAdminCore\Policies\CategoryTypePolicy',
21+
'BalajiDharma\LaravelMenu\Models\Menu' => 'BalajiDharma\LaravelAdminCore\Policies\MenuPolicy',
22+
'BalajiDharma\LaravelMenu\Models\MenuItem' => 'BalajiDharma\LaravelAdminCore\Policies\MenuItemPolicy',
23+
'Plank\Mediable\Media' => 'BalajiDharma\LaravelAdminCore\Policies\MediaPolicy',
2324
];
2425

2526
/**

resources/views/admin/category/item/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<x-admin.grid.th>
4444
{{ __('Enabled') }}
4545
</x-admin.grid.th>
46-
@canany(['adminUpdate', 'adminDelete'], \BalajiDharma\LaravelCategory\Models\Category::class)
46+
@canany(['adminUpdate', 'adminDelete'], new \BalajiDharma\LaravelCategory\Models\Category)
4747
<x-admin.grid.th>
4848
{{ __('Actions') }}
4949
</x-admin.grid.th>

resources/views/admin/category/type/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<x-admin.grid.th>
2525
{{ __('Machine name') }}
2626
</x-admin.grid.th>
27-
@canany(['adminUpdate', 'adminDelete'], \BalajiDharma\LaravelCategory\Models\CategoryType::class)
27+
@canany(['adminUpdate', 'adminDelete'], new \BalajiDharma\LaravelCategory\Models\CategoryType)
2828
<x-admin.grid.th>
2929
{{ __('Actions') }}
3030
</x-admin.grid.th>

resources/views/admin/media/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<x-admin.grid.th>
2828
{{ __('Created') }}
2929
</x-admin.grid.th>
30-
@canany(['adminUpdate', 'adminDelete'], \Plank\Mediable\Media::class)
30+
@canany(['adminUpdate', 'adminDelete'], new \Plank\Mediable\Media)
3131
<x-admin.grid.th>
3232
{{ __('Actions') }}
3333
</x-admin.grid.th>

resources/views/admin/menu/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<x-admin.grid.th>
2525
{{ __('Machine name') }}
2626
</x-admin.grid.th>
27-
@canany(['adminUpdate', 'adminDelete'], \BalajiDharma\LaravelMenu\Models\Menu::class)
27+
@canany(['adminUpdate', 'adminDelete'], new \BalajiDharma\LaravelMenu\Models\Menu)
2828
<x-admin.grid.th>
2929
{{ __('Actions') }}
3030
</x-admin.grid.th>

resources/views/admin/menu/item/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<x-admin.grid.th>
4141
{{ __('Enabled') }}
4242
</x-admin.grid.th>
43-
@canany(['adminUpdate', 'adminDelete'], \BalajiDharma\LaravelMenu\Models\MenuItem::class)
43+
@canany(['adminUpdate', 'adminDelete'], new \BalajiDharma\LaravelMenu\Models\MenuItem)
4444
<x-admin.grid.th>
4545
{{ __('Actions') }}
4646
</x-admin.grid.th>

resources/views/admin/permission/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<x-admin.grid.th>
1919
@include('admin.includes.sort-link', ['label' => 'Name', 'attribute' => 'name'])
2020
</x-admin.grid.th>
21-
@canany(['adminUpdate', 'adminDelete'], \App\Models\Permission::class)
21+
@canany(['adminUpdate', 'adminDelete'], new \App\Models\Permission)
2222
<x-admin.grid.th>
2323
{{ __('Actions') }}
2424
</x-admin.grid.th>

resources/views/admin/role/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<x-admin.grid.th>
1919
@include('admin.includes.sort-link', ['label' => 'Name', 'attribute' => 'name'])
2020
</x-admin.grid.th>
21-
@canany(['adminUpdate', 'adminDelete'], \App\Models\Role::class)
21+
@canany(['adminUpdate', 'adminDelete'], new \App\Models\Role)
2222
<x-admin.grid.th>
2323
{{ __('Actions') }}
2424
</x-admin.grid.th>

resources/views/admin/user/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<x-admin.grid.th>
2222
@include('admin.includes.sort-link', ['label' => 'Email', 'attribute' => 'email'])
2323
</x-admin.grid.th>
24-
@canany(['adminUpdate', 'adminDelete'], \App\Models\User::class)
24+
@canany(['adminUpdate', 'adminDelete'], new \App\Models\User)
2525
<x-admin.grid.th>
2626
{{ __('Actions') }}
2727
</x-admin.grid.th>

0 commit comments

Comments
 (0)