nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] BASE: Updated get_querset function of shift request and work type request

Browse Source
This commit is contained in:
Horilla
2025-10-21 15:49:29 +05:30
parent 00b58e99e6
commit 24d4f68647
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
base/cbv/shift_request.py
View File

@@ -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"):

14
base/cbv/work_type_request.py
View File

@@ -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 = [