diff --git a/accessibility/decorators.py b/accessibility/decorators.py index c08395ebe..ea1fc7550 100644 --- a/accessibility/decorators.py +++ b/accessibility/decorators.py @@ -34,7 +34,7 @@ def check_accessible(request, *args, **kwargs): if perm: has_perm = request.user.has_perm(perm) - if accessible or has_perm or (method and method(request)): + if accessible or has_perm or (method and method(request, *args, **kwargs)): return function(request, *args, **kwargs) key = "HTTP_HX_REQUEST" keys = request.META.keys() diff --git a/employee/views.py b/employee/views.py index 70233f69a..4b0c455a0 100755 --- a/employee/views.py +++ b/employee/views.py @@ -175,9 +175,17 @@ def return_none(a, b): } -def _check_reporting_manager(request): +def _check_reporting_manager(request, *args, **kwargs): + obj_id = kwargs["obj_id"] + emp = Employee.objects.get(id=obj_id) + re_manager = None + if emp.employee_work_info.reporting_manager_id != None: + re_manager = emp.employee_work_info.reporting_manager_id employee = request.user.employee_get - return employee.reporting_manager.exists() + if re_manager != None: + return re_manager == employee + else: + return False # Create your views here.