From c81da2bbb5aede1bf5115b43d7610c25a26d850a Mon Sep 17 00:00:00 2001 From: Sockenklaus Date: Fri, 29 Oct 2021 23:29:52 +0200 Subject: [PATCH] Fixed EmployeesController.show: Now fetches Employee + User when there is a user regardles of parameter type. --- app/Controllers/Http/EmployeesController.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Controllers/Http/EmployeesController.ts b/app/Controllers/Http/EmployeesController.ts index 76a697e..3a9e307 100644 --- a/app/Controllers/Http/EmployeesController.ts +++ b/app/Controllers/Http/EmployeesController.ts @@ -85,16 +85,15 @@ export default class EmployeesController { user: {} } let emp + let user if(params.id === 'me' && auth.isLoggedIn && auth.user !== undefined){ - result.employee.hasUser = true - result.user.username = auth.user.username - result.user.id = auth.user.id - + user = auth.user emp = (await auth.user.related('employeeProfile').query().limit(1))[0] } else { emp = await Employee.findOrFail(params.id) + user = (await User.find(emp.userId)) ?? undefined } if(emp !== undefined){ @@ -106,6 +105,11 @@ export default class EmployeesController { result.employee.email = emp.email result.employee.contractHours = emp.contractHours } + if(user !== undefined){ + result.employee.hasUser = true + result.user.username = user.username + result.user.id = user.id + } await bouncer.authorize('employees.show', emp)