More test fixes

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/StatuslabelsController.php

@@ -26,14 +26,10 @@ class StatuslabelsController extends Controller
         return view('statuslabels.index');
     }
 
-    public function show($id) : View | RedirectResponse
+    public function show(Statuslabel $statuslabel) : View | RedirectResponse
     {
         $this->authorize('view', Statuslabel::class);
-        if ($statuslabel = Statuslabel::find($id)) {
+        return view('statuslabels.view')->with('statuslabel', $statuslabel);
-            return view('statuslabels.view')->with('statuslabel', $statuslabel);
-        }
-
-        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
     }
 
     /**

app/Http/Requests/DeleteUserRequest.php

@@ -24,11 +24,11 @@ class DeleteUserRequest extends FormRequest
 
     public function prepareForValidation(): void
     {
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user.id'));
 
         if ($user_to_delete) {
             $this->merge([
-                'user' => request()->route('user'),
+                'user' => request()->route('user')->id,
                 'admin_id' => auth()->id(),
                 'managed_users' => $user_to_delete->managesUsers()->count(),
                 'managed_locations' => $user_to_delete->managedLocations()->count(),
@@ -61,7 +61,7 @@ class DeleteUserRequest extends FormRequest
     public function messages(): array
     {
 
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user.id'));
         $messages = [];
 
         if ($user_to_delete) {

app/Presenters/StatusLabelPresenter.php

@@ -28,7 +28,7 @@ class StatusLabelPresenter extends Presenter
                 'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
-                'formatter' => 'statuslabelsAssetLinkFormatter',
+                'formatter' => 'statuslabelsLinkFormatter',
             ],[
                 'field' => 'type',
                 'searchable' => false,

resources/lang/en-US/general.php

@@ -587,6 +587,6 @@ return [
         'notes'  => 'Add a note',
     ],
 
-    'generic_model_not_found' => ':model not found',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
 
 ];

routes/web.php

@@ -102,9 +102,7 @@ Route::group(['middleware' => 'auth'], function () {
         Route::post('{manufacturers_id}/restore', [ManufacturersController::class, 'restore'] )->name('restore/manufacturer');
     });
 
-    Route::resource('manufacturers', ManufacturersController::class, [
+    Route::resource('manufacturers', ManufacturersController::class);
-        'parameters' => ['manufacturer' => 'manufacturers_id'],
-    ]);
 
     /*
     * Suppliers
@@ -124,9 +122,7 @@ Route::group(['middleware' => 'auth'], function () {
     /*
     * Departments
     */
-    Route::resource('departments', DepartmentsController::class, [
+    Route::resource('departments', DepartmentsController::class);
-        'parameters' => ['department' => 'department_id'],
-    ]);
 });
 
 /*

tests/Feature/Users/Api/DeleteUsersTest.php

@@ -37,7 +37,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
     {
         $user = User::factory()->deletedUser()->create();
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $user->id))
+            ->deleteJson(route('api.users.destroy', $user))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -51,7 +51,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -66,7 +66,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -81,7 +81,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -111,7 +111,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $userFromB = User::factory()->deleteUsers()->for($companyB)->create();
 
         $this->actingAsForApi($userFromA)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromB->id]))
+            ->deleteJson(route('api.users.destroy',  $userFromB))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -121,7 +121,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertNull($userFromB->deleted_at);
 
         $this->actingAsForApi($userFromB)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
+            ->deleteJson(route('api.users.destroy', $userFromA))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -131,7 +131,7 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
         $this->assertNull($userFromA->deleted_at);
 
         $this->actingAsForApi($superuser)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
+            ->deleteJson(route('api.users.destroy', $userFromA))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('success')

tests/Feature/Users/Ui/ViewUserTest.php

@@ -20,11 +20,11 @@ class ViewUserTest extends TestCase
         $user = User::factory()->for($companyB)->create();
 
         $this->actingAs(User::factory()->editUsers()->for($companyA)->create())
-            ->get(route('users.show', ['user' => $user->id]))
+            ->get(route('users.show', $user))
             ->assertStatus(403);
 
         $this->actingAs($superuser)
-            ->get(route('users.show', ['user' => $user->id]))
+            ->get(route('users.show', $user))
             ->assertOk()
             ->assertStatus(200);
     }