From 6e4b651be3956e02ac5270a389175e9ef890ef6e Mon Sep 17 00:00:00 2001
From: Tomasz Boruc <boructomek@gmail.com>
Date: Mon, 31 Aug 2026 18:33:21 +0200
Subject: [PATCH] Poprawka przy usuwaniu/edycji uzytkownika

---
 resources/views/users/edit.blade.php | 22 ++++++++++++----------
 tests/Feature/UserSoftDeleteTest.php | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 4ec3a55..ddeb0f1 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -67,18 +67,20 @@
                                         {{ __('Anuluj') }}
                                     </a>
                                 </div>
-
-                                @if(auth()->id() !== $user->id)
-                                    <form method="POST" action="{{ route('users.destroy', $user) }}" onsubmit="return confirm('Czy na pewno chcesz usunąć tego użytkownika?');">
-                                        @csrf
-                                        @method('DELETE')
-                                        <button type="submit" class="inline-flex items-center px-4 py-2 bg-red-600 hover:bg-red-500 text-white text-sm font-medium rounded-md shadow-sm transition">
-                                            {{ __('Usuń użytkownika') }}
-                                        </button>
-                                    </form>
-                                @endif
                             </div>
                         </form>
+
+                        @if(auth()->id() !== $user->id)
+                            <div class="mt-6 flex justify-end">
+                                <form method="POST" action="{{ route('users.destroy', $user) }}" onsubmit="return confirm('Czy na pewno chcesz usunąć tego użytkownika?');">
+                                    @csrf
+                                    @method('DELETE')
+                                    <button type="submit" class="inline-flex items-center px-4 py-2 bg-red-600 hover:bg-red-500 text-white text-sm font-medium rounded-md shadow-sm transition">
+                                        {{ __('Usuń użytkownika') }}
+                                    </button>
+                                </form>
+                            </div>
+                        @endif
                     </section>
                 </div>
             </div>
diff --git a/tests/Feature/UserSoftDeleteTest.php b/tests/Feature/UserSoftDeleteTest.php
index d1b8f54..05188f1 100644
--- a/tests/Feature/UserSoftDeleteTest.php
+++ b/tests/Feature/UserSoftDeleteTest.php
@@ -42,3 +42,24 @@ test('deleted users can be listed and restored', function () {
     $restoreResponse->assertRedirect(route('users.deleted'));
     $this->assertNull($user->fresh()->deleted_at);
 });
+
+test('edit page does not render nested forms for user actions', function () {
+    Permission::firstOrCreate(['name' => 'users_access']);
+
+    $admin = User::factory()->create();
+    $adminRole = Role::firstOrCreate(['name' => 'admin']);
+    $admin->assignRole($adminRole);
+    $admin->givePermissionTo('users_access');
+
+    $user = User::factory()->create();
+
+    $response = $this->actingAs($admin)->get('/users/' . $user->id . '/edit');
+    $response->assertOk();
+
+    $html = $response->getContent();
+
+    $this->assertDoesNotMatchRegularExpression(
+        '/<form[^>]*action="[^"]*\/users\/' . preg_quote((string) $user->id, '/') . '[^"]*"[^>]*>(?:(?!<\/form>).)*<form\b/s',
+        $html
+    );
+});