[FIX] PMS: Fixed employee filter widget for update form
This commit is contained in:
@@ -272,7 +272,7 @@ def meeting_manager_can_enter(function, perm, answerable = False):
|
||||
|
||||
if answerable:
|
||||
is_answer_employee = Employee.objects.filter(
|
||||
meeting_answer_employees=False,
|
||||
meeting_answer_employees__isnull=False,
|
||||
).filter(id=employee.id).exists()
|
||||
|
||||
if user.has_perm(perm) or is_manager or is_answer_employee:
|
||||
|
||||
@@ -649,6 +649,9 @@ class Meetings(HorillaModel):
|
||||
)
|
||||
response = models.TextField(null=True, blank=True)
|
||||
show_response = models.BooleanField(default=False)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Meetings")
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
@@ -3042,7 +3042,8 @@ def view_meetings(request):
|
||||
meetings = Meetings.objects.filter(is_active=True)
|
||||
if not request.user.has_perm("pms.view_meetings"):
|
||||
employee_id = request.user.employee_get
|
||||
meetings = meetings.filter(Q(employee_id = employee_id) | Q(manager = employee_id)).distinct().order_by("-id")
|
||||
meetings = meetings.filter(Q(employee_id = employee_id) | Q(manager = employee_id)).distinct()
|
||||
meetings = meetings.order_by("-id")
|
||||
filter_form = MeetingsFilter()
|
||||
|
||||
meetings = paginator_qry(meetings, request.GET.get("page"))
|
||||
@@ -3154,7 +3155,9 @@ def filter_meetings(request):
|
||||
|
||||
if not request.user.has_perm("pms.view_meetings"):
|
||||
employee_id = request.user.employee_get
|
||||
filter_obj = filter_obj.filter(Q(employee_id = employee_id) | Q(manager = employee_id)).distinct().order_by("-id")
|
||||
filter_obj = filter_obj.filter(Q(employee_id = employee_id) | Q(manager = employee_id)).distinct()
|
||||
filter_obj = filter_obj.order_by("-id")
|
||||
|
||||
filter_obj = sortby(request, filter_obj, "sortby")
|
||||
filter_obj = paginator_qry(filter_obj, request.GET.get("page"))
|
||||
requests_ids = json.dumps([instance.id for instance in filter_obj.object_list])
|
||||
|
||||
Reference in New Issue
Block a user