diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php index c719b4c89..6fd261206 100755 --- a/app/Http/Controllers/StatuslabelsController.php +++ b/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 redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist')); + return view('statuslabels.view')->with('statuslabel', $statuslabel); } /** diff --git a/app/Http/Requests/DeleteUserRequest.php b/app/Http/Requests/DeleteUserRequest.php index 99574950d..1c200e4eb 100644 --- a/app/Http/Requests/DeleteUserRequest.php +++ b/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) { diff --git a/app/Presenters/StatusLabelPresenter.php b/app/Presenters/StatusLabelPresenter.php index 2e4340004..5bc4bd883 100644 --- a/app/Presenters/StatusLabelPresenter.php +++ b/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, diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index e7ce1e065..a34ac631b 100644 --- a/resources/lang/en-US/general.php +++ b/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', ]; diff --git a/routes/web.php b/routes/web.php index 401d0845d..f0c2ac79b 100644 --- a/routes/web.php +++ b/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, [ - 'parameters' => ['manufacturer' => 'manufacturers_id'], - ]); + Route::resource('manufacturers', ManufacturersController::class); /* * Suppliers @@ -124,9 +122,7 @@ Route::group(['middleware' => 'auth'], function () { /* * Departments */ - Route::resource('departments', DepartmentsController::class, [ - 'parameters' => ['department' => 'department_id'], - ]); + Route::resource('departments', DepartmentsController::class); }); /* diff --git a/tests/Feature/Users/Api/DeleteUsersTest.php b/tests/Feature/Users/Api/DeleteUsersTest.php index 9677e5f7d..a2e43f04b 100644 --- a/tests/Feature/Users/Api/DeleteUsersTest.php +++ b/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') diff --git a/tests/Feature/Users/Ui/ViewUserTest.php b/tests/Feature/Users/Ui/ViewUserTest.php index 791c80489..6b85d32ff 100644 --- a/tests/Feature/Users/Ui/ViewUserTest.php +++ b/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); }