Merge remote-tracking branch 'origin/#4-users-crud' into #4-users-crud

# Conflicts:
#	app/Enums/FormOfEmployment.php
#	app/Models/User.php
#	resources/js/Pages/Users/Index.vue
#	routes/web.php
This commit is contained in:
Adrian Hopek
2022-01-18 07:40:57 +01:00
18 changed files with 71 additions and 29 deletions

View File

@@ -49,7 +49,7 @@ class UserController extends Controller
{
return inertia("Users/Edit", [
"user" => new UserFormDataResource($user),
"employmentForms" => FormOfEmployment::casesToSelect()
"employmentForms" => FormOfEmployment::casesToSelect(),
]);
}