Skip to content

Commit 939ddab

Browse files
committed
Use permission.models.role config as role resource model
1 parent d617b84 commit 939ddab

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Unreleased
44

5+
- Role resource now uses `permission.models.role` configuration as resource model
6+
57
## v1.2.4 (2023-03-05)
68

79
- Fixed an issue where permissions field were showing duplicated values.

src/Nova/Permission.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Laravel\Nova\Fields\MorphToMany;
99
use Laravel\Nova\Fields\Select;
1010
use Laravel\Nova\Fields\Text;
11-
use Spatie\Permission\Models\Permission as SpatiePermission;
11+
use Spatie\Permission\Models\Permission as PermissionModel;
1212

1313
/**
1414
* @property static class-string $model
@@ -35,7 +35,7 @@ class Permission extends Resource
3535
*
3636
* @var string
3737
*/
38-
public static $model = SpatiePermission::class;
38+
public static $model = PermissionModel::class;
3939

4040
/**
4141
* The columns that should be searched.

src/ToolServiceProvider.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Laravel\Nova\Events\ServingNova;
1010
use Laravel\Nova\Nova;
1111
use Sereny\NovaPermissions\Nova\Permission;
12+
use Sereny\NovaPermissions\Nova\Role;
1213

1314
class ToolServiceProvider extends ServiceProvider
1415
{
@@ -32,6 +33,7 @@ public function boot(Filesystem $filesystem)
3233
$this->routes();
3334
});
3435

36+
Role::$model = config('permission.models.role');
3537
Permission::$model = config('permission.models.permission');
3638

3739
Nova::serving(function (ServingNova $event) {

0 commit comments

Comments
 (0)