Poprawki w module ustawienia ( role)

This commit is contained in:
Tomasz Boruc 2026-08-30 20:58:46 +02:00
parent c13d46cebd
commit d550bab596
4 changed files with 94 additions and 1 deletions

View File

@ -5,14 +5,18 @@ namespace App\Http\Controllers;
use App\Models\AdvanceType; use App\Models\AdvanceType;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\View\View; use Illuminate\View\View;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\Models\Role;
class SettingsController extends Controller class SettingsController extends Controller
{ {
public function index(): View public function index(): View
{ {
$advanceTypes = AdvanceType::orderBy('name')->get(); $advanceTypes = AdvanceType::orderBy('name')->get();
$roles = Role::with('permissions')->orderBy('name')->get();
$permissions = Permission::orderBy('name')->get();
return view('settings.index', compact('advanceTypes')); return view('settings.index', compact('advanceTypes', 'roles', 'permissions'));
} }
public function storeAdvanceType(Request $request) public function storeAdvanceType(Request $request)
@ -57,4 +61,28 @@ class SettingsController extends Controller
return redirect()->route('settings.index')->with('status', 'Rodzaj zaliczki został usunięty.'); return redirect()->route('settings.index')->with('status', 'Rodzaj zaliczki został usunięty.');
} }
public function storeRolePermissions(Request $request)
{
$request->validate([
'permissions' => ['array'],
'permissions.*' => ['array'],
'permissions.*.*' => ['string'],
]);
foreach ($request->input('permissions', []) as $roleId => $selectedPermissions) {
$role = Role::find($roleId);
if (! $role) {
continue;
}
$allPermissions = Permission::pluck('name')->all();
$selectedPermissions = is_array($selectedPermissions) ? $selectedPermissions : [];
$role->syncPermissions(array_intersect($allPermissions, $selectedPermissions));
}
return redirect()->route('settings.index')->with('status', 'Uprawnienia ról zostały zaktualizowane.');
}
} }

View File

@ -107,6 +107,49 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bg-white dark:bg-gray-800 shadow-sm rounded-lg border border-gray-200 dark:border-gray-700/50 overflow-hidden">
<button type="button" class="w-full flex items-center justify-between px-5 py-4 text-left font-semibold text-gray-900 dark:text-white bg-gray-50 dark:bg-gray-800/80 hover:bg-gray-100 dark:hover:bg-gray-700/80 transition" onclick="const panel=this.nextElementSibling; panel.classList.toggle('hidden'); this.querySelector('svg').classList.toggle('rotate-180');">
<span>Uprawnienia ról</span>
<svg class="w-5 h-5 transition-transform duration-200" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M5.23 7.21a.75.75 0 011.06.02L10 11.17l3.71-3.94a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z" clip-rule="evenodd" />
</svg>
</button>
<div class="hidden p-5">
<form method="POST" action="{{ route('settings.role-permissions.store') }}">
@csrf
<div class="space-y-6">
@foreach($roles as $role)
<div class="rounded-lg border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-900/40 p-4">
<div class="mb-3">
<h4 class="text-base font-semibold text-gray-900 dark:text-white">{{ ucfirst($role->name) }}</h4>
</div>
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
@foreach($permissions as $permission)
<label class="flex items-center gap-3 rounded-md border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 px-3 py-2 text-sm text-gray-700 dark:text-gray-200">
<input type="checkbox"
name="permissions[{{ $role->id }}][]"
value="{{ $permission->name }}"
{{ $role->permissions->contains('id', $permission->id) ? 'checked' : '' }}
class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-500">
<span>{{ $permission->name }}</span>
</label>
@endforeach
</div>
</div>
@endforeach
</div>
<div class="mt-6 flex justify-end">
<button type="submit" class="inline-flex items-center justify-center px-4 py-2 bg-indigo-600 hover:bg-indigo-500 text-white text-sm font-medium rounded-md shadow-sm transition">
Zapisz uprawnienia
</button>
</div>
</form>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -40,6 +40,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
Route::post('/settings/advance-types', [SettingsController::class, 'storeAdvanceType'])->name('settings.advance-types.store'); Route::post('/settings/advance-types', [SettingsController::class, 'storeAdvanceType'])->name('settings.advance-types.store');
Route::put('/settings/advance-types/{advanceType}', [SettingsController::class, 'updateAdvanceType'])->name('settings.advance-types.update'); Route::put('/settings/advance-types/{advanceType}', [SettingsController::class, 'updateAdvanceType'])->name('settings.advance-types.update');
Route::delete('/settings/advance-types/{advanceType}', [SettingsController::class, 'destroyAdvanceType'])->name('settings.advance-types.destroy'); Route::delete('/settings/advance-types/{advanceType}', [SettingsController::class, 'destroyAdvanceType'])->name('settings.advance-types.destroy');
Route::post('/settings/role-permissions', [SettingsController::class, 'storeRolePermissions'])->name('settings.role-permissions.store');
}); });
// Moduł Raporty // Moduł Raporty

View File

@ -115,6 +115,27 @@ test('manager can edit and delete an advance type from settings', function () {
$this->assertDatabaseMissing('advance_types', ['id' => $type->id]); $this->assertDatabaseMissing('advance_types', ['id' => $type->id]);
}); });
test('manager can update role permissions from settings', function () {
Permission::firstOrCreate(['name' => 'users_access']);
Permission::firstOrCreate(['name' => 'raporty_access']);
Permission::firstOrCreate(['name' => 'flota_access']);
$manager = User::factory()->create();
$managerRole = Role::firstOrCreate(['name' => 'kierownik']);
$managerRole->givePermissionTo('users_access');
$manager->assignRole($managerRole);
$response = $this->actingAs($manager)->post(route('settings.role-permissions.store'), [
'permissions' => [
$managerRole->id => ['users_access', 'raporty_access'],
],
]);
$response->assertRedirect(route('settings.index'));
$this->assertTrue($managerRole->fresh()->hasPermissionTo('raporty_access'));
$this->assertFalse($managerRole->fresh()->hasPermissionTo('flota_access'));
});
test('manager cannot delete an advance type that is still used in advances', function () { test('manager cannot delete an advance type that is still used in advances', function () {
Permission::firstOrCreate(['name' => 'users_access']); Permission::firstOrCreate(['name' => 'users_access']);