kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#118 - fix

Browse Source
This commit is contained in:
Adrian Hopek 2022-04-20 12:50:48 +02:00
parent 64032a7c73
commit 624465e352
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Architecture/Providers/AuthServiceProvider.php
View File

@ -35,6 +35,5 @@ class AuthServiceProvider extends ServiceProvider
Gate::define("manageVacationLimits", fn(User $user) => $user->role === Role::AdministrativeApprover); Gate::define("manageVacationLimits", fn(User $user) => $user->role === Role::AdministrativeApprover);
Gate::define("generateTimesheet", fn(User $user) => $user->role === Role::AdministrativeApprover); Gate::define("generateTimesheet", fn(User $user) => $user->role === Role::AdministrativeApprover);
Gate::define("listMonthlyUsage", fn(User $user) => $user->role === Role::AdministrativeApprover); Gate::define("listMonthlyUsage", fn(User $user) => $user->role === Role::AdministrativeApprover);
Gate::define("manageKeys", fn(User $user) => $user->role === Role::AdministrativeApprover);
} }
} }

26
app/Infrastructure/Http/Controllers/KeysController.php
View File

@ -43,33 +43,45 @@ class KeysController extends Controller
{ {
$this->authorize("manageKeys"); $this->authorize("manageKeys");
$request->user()->keys()->create(); $key = $request->user()->keys()->create();
return redirect() return redirect()
->back() ->back()
->with("success", __("Key has been created.")); ->with("success", __("Key no :number has been created.", [
"number" => $key->id,
]));
} }
public function take(Key $key, Request $request): RedirectResponse public function take(Key $key, Request $request): RedirectResponse
{ {
$previousUser = $key->user;
$key->user()->associate($request->user()); $key->user()->associate($request->user());
$key->save(); $key->save();
return redirect() return redirect()
->back() ->back()
->with("success", __("Key has been taken.")); ->with("success", __("Key no :number has been taken from :user.", [
"number" => $key->id,
"user" => $previousUser->profile->full_name,
]));
} }
public function give(Key $key, GiveKeyRequest $request): RedirectResponse public function give(Key $key, GiveKeyRequest $request): RedirectResponse
{ {
$key->user()->associate($request->recipient()); $recipient = $request->recipient();
$key->user()->associate($recipient);
$key->save(); $key->save();
return redirect() return redirect()
->back() ->back()
->with("success", __("Key has been given.")); ->with("success", __("Key no :number has been given to :user.", [
"number" => $key->id,
"user" => $recipient->profile->full_name,
]));
} }
public function destroy(Key $key): RedirectResponse public function destroy(Key $key): RedirectResponse
@ -80,6 +92,8 @@ class KeysController extends Controller
return redirect() return redirect()
->back() ->back()
->with("success", __("Key has been deleted.")); ->with("success", __("Key no :number has been deleted.", [
"number" => $key->id,
]));
} }
} }

1
database/seeders/DatabaseSeeder.php
View File

@ -90,7 +90,6 @@ class DatabaseSeeder extends Seeder
foreach ($users as $user) { foreach ($users as $user) {
Key::factory() Key::factory()
->for($user, "owner") ->for($user, "owner")
->for($user, "previousOwner")
->create(); ->create();
} }
} }

8
resources/lang/pl.json
View File

@ -67,8 +67,8 @@
"The vacation request :title from user :requester has been :status.": "Wniosek urlopowy :title użytkownika :requester został :status.", "The vacation request :title from user :requester has been :status.": "Wniosek urlopowy :title użytkownika :requester został :status.",
"Vacation request :title has been created on your behalf": "Wniosek urlopowy :title został utworzony w Twoim imieniu", "Vacation request :title has been created on your behalf": "Wniosek urlopowy :title został utworzony w Twoim imieniu",
"The vacation request :title has been created correctly by user :creator on your behalf in the :appName.": "W systemie :appName został poprawnie utworzony wniosek urlopowy :title w Twoim imieniu przez użytkownika :creator.", "The vacation request :title has been created correctly by user :creator on your behalf in the :appName.": "W systemie :appName został poprawnie utworzony wniosek urlopowy :title w Twoim imieniu przez użytkownika :creator.",
"Key has been created.": "Klucz został utworzony.", "Key no :number has been created.": "Klucz nr :number został utworzony.",
"Key has been deleted.": "Klucz został usunięty.", "Key no :number has been deleted.": "Klucz nr :number został usunięty.",
"Key has been taken.": "Klucz został zabrany.", "Key no :number has been taken from :user.": "Klucz nr :number został zabrany od użytkownika :user.",
"Key has been given.": "Klucz został przekazany." "Key no :number has been given to :user.": "Klucz nr :number został przekazany użytkownikowi :user."
} }