From f4e296ae9e0d20cbd37fb93122c94b270c77fc38 Mon Sep 17 00:00:00 2001 From: Horilla Date: Wed, 24 Sep 2025 16:22:36 +0530 Subject: [PATCH] [FIX] BASE: fixed rotating work type and shift assign detail view for employees without work info --- base/models.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/base/models.py b/base/models.py index a507b6a2b..17bd4232e 100644 --- a/base/models.py +++ b/base/models.py @@ -619,11 +619,8 @@ class RotatingWorkTypeAssign(HorillaModel): """ Return subtitle containing both department and job position information. """ - try: - return f"""{self.employee_id.employee_work_info.department_id } / - { self.employee_id.employee_work_info.job_position_id}""" - except: - return None + + return f"{self.employee_id.get_department()} / {self.employee_id.get_job_position()}" def work_rotate_detail_view(self): """ @@ -1214,8 +1211,7 @@ class RotatingShiftAssign(HorillaModel): Detail view subtitle """ - return f"""{self.employee_id.employee_work_info.department_id } / - { self.employee_id.employee_work_info.job_position_id}""" + return f"{self.employee_id.get_department()} / {self.employee_id.get_job_position()}" def check_active(self): """