diff --git a/base/cbv/shift_request.py b/base/cbv/shift_request.py index b43d37646..0059d48bf 100644 --- a/base/cbv/shift_request.py +++ b/base/cbv/shift_request.py @@ -124,15 +124,15 @@ class ShiftRequestList(ShiftList): def get_queryset(self): queryset = super().get_queryset() data = queryset - if not self.request.user.has_perm("base.view_shiftrequest"): - employee = self.request.user.employee_get - queryset = filtersubordinates( - self.request, - queryset.filter(reallocate_to__isnull=True), - "base.add_shiftrequest", - ) - queryset = queryset | data.filter(employee_id=employee) - queryset = queryset.filter(employee_id__is_active=True) + + employee = self.request.user.employee_get + queryset = filtersubordinates( + self.request, + queryset.filter(reallocate_to__isnull=True), + "base.view_shiftrequest", + ) + queryset = queryset | data.filter(employee_id=employee) + queryset = queryset.filter(employee_id__is_active=True) return queryset @@ -203,7 +203,7 @@ class AllocatedShift(ShiftList): queryset = filtersubordinates( self.request, queryset.filter(reallocate_to__isnull=False), - "base.add_shiftrequest", + "base.view_shiftrequest", ) allocated_requests = b.filter(reallocate_to__isnull=False) if not self.request.user.has_perm("base.view_shiftrequest"): diff --git a/base/cbv/work_type_request.py b/base/cbv/work_type_request.py index 1134f2de5..0c39230aa 100644 --- a/base/cbv/work_type_request.py +++ b/base/cbv/work_type_request.py @@ -64,13 +64,13 @@ class WorkRequestListView(HorillaListView): """ queryset = super().get_queryset() view_data = queryset - if not self.request.user.has_perm("base.view_worktyperequest"): - employee = self.request.user.employee_get - queryset = filtersubordinates( - self.request, queryset, "base.add_worktyperequest" - ) - queryset = queryset | view_data.filter(employee_id=employee) - queryset = queryset.filter(employee_id__is_active=True) + + employee = self.request.user.employee_get + queryset = filtersubordinates( + self.request, queryset, "base.view_worktyperequest" + ) + queryset = queryset | view_data.filter(employee_id=employee) + queryset = queryset.filter(employee_id__is_active=True) return queryset columns = [