mirror of
https://github.com/pelican-dev/panel.git
synced 2025-12-08 18:30:15 +01:00
Make sure case for role permissions is correct (#1892)
This commit is contained in:
parent
acec117b1e
commit
445c9364bc
@ -124,7 +124,7 @@ class RoleResource extends Resource
|
||||
$options = [];
|
||||
|
||||
foreach ($permissions as $permission) {
|
||||
$options[$permission . ' ' . strtolower($model)] = Str::headline($permission);
|
||||
$options[$permission . ' ' . $model] = Str::headline($permission);
|
||||
}
|
||||
|
||||
$permissionSections[] = self::makeSection($model, $options);
|
||||
|
||||
@ -342,9 +342,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
|
||||
return false;
|
||||
}
|
||||
|
||||
$check = in_array($permission, $subuser->permissions);
|
||||
|
||||
return $check;
|
||||
return in_array($permission, $subuser->permissions);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Role;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Str;
|
||||
use Spatie\Permission\Models\Permission;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
DB::transaction(function () {
|
||||
$allPermissions = [];
|
||||
|
||||
foreach (Role::getPermissionList() as $model => $permissions) {
|
||||
foreach ($permissions as $permission) {
|
||||
$allPermissions[] = $permission . ' ' . $model;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (Permission::all() as $spatiePermission) {
|
||||
$name = $spatiePermission->name;
|
||||
|
||||
foreach ($allPermissions as $permission) {
|
||||
if (Str::lower($name) === Str::lower($permission)) {
|
||||
$name = $permission;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$spatiePermission->update(['name' => $name]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
// Not needed
|
||||
}
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user