-
+
diff --git a/attendance/views/requests.py b/attendance/views/requests.py
index 031b596a1..b9a5a9ac9 100644
--- a/attendance/views/requests.py
+++ b/attendance/views/requests.py
@@ -432,7 +432,6 @@ def validate_attendance_request(request, attendance_id):
other_dict = first_dict
first_dict = empty_data
else:
- print(attendance.requested_data)
other_dict = json.loads(attendance.requested_data)
requests_ids_json = request.GET.get("requests_ids")
previous_instance_id = next_instance_id = attendance.pk
diff --git a/base/cbv/mail_log_tab.py b/base/cbv/mail_log_tab.py
index 1fdae9007..d04797f8d 100644
--- a/base/cbv/mail_log_tab.py
+++ b/base/cbv/mail_log_tab.py
@@ -6,14 +6,30 @@ from typing import Any
from django.db.models import Q
from django.urls import reverse
+from django.utils.decorators import method_decorator
from django.utils.translation import gettext_lazy as _
+from accessibility.cbv_decorators import enter_if_accessible
from base.filters import MailLogFilter
from base.models import EmailLog
from employee.models import Employee
+from horilla_views.cbv_methods import login_required
from horilla_views.generic.cbv.views import HorillaDetailedView, HorillaListView
+def _check_reporting_manager(request, *args, **kwargs):
+ return request.user.employee_get.reporting_manager.exists()
+
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+ enter_if_accessible(
+ feature="view_mail_log",
+ perm="employee.view_employee",
+ method=_check_reporting_manager,
+ ),
+ name="dispatch",
+)
class MailLogTabList(HorillaListView):
"""
list view for mail log tab
@@ -68,6 +84,15 @@ class MailLogTabList(HorillaListView):
"""
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+ enter_if_accessible(
+ feature="view_mail_log",
+ perm="employee.view_employee",
+ method=_check_reporting_manager,
+ ),
+ name="dispatch",
+)
class MailLogDetailView(HorillaDetailedView):
"""
detail view for mail log tab
diff --git a/base/forms.py b/base/forms.py
index 4154c74c6..8198e788c 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -245,8 +245,12 @@ class ModelForm(forms.ModelForm):
pass
try:
- self.fields["company_id"].initial = (
- request.user.employee_get.get_company
+ company_field = self.fields["company_id"]
+ company = request.user.employee_get.get_company
+ company_queryset = company_field.queryset
+
+ company_field.initial = (
+ company if company in company_queryset else company_queryset.first()
)
except:
pass
diff --git a/base/methods.py b/base/methods.py
index 52eaafe63..d00639b60 100644
--- a/base/methods.py
+++ b/base/methods.py
@@ -608,28 +608,30 @@ def export_data(request, model, form_class, filter_class, file_name, perm=None):
def reload_queryset(fields):
"""
- This method is used to reload the querysets in the form
+ Reloads querysets in the form based on active filters and selected company.
"""
+ request = getattr(_thread_locals, "request", None)
+ selected_company = request.session.get("selected_company") if request else None
+
+ recruitment_installed = apps.is_installed("recruitment")
model_filters = {
"Employee": {"is_active": True},
- "Candidate": {"is_active": True} if apps.is_installed("recruitment") else None,
+ "Candidate": {"is_active": True} if recruitment_installed else None,
}
- request = getattr(_thread_locals, "request", None)
- selected_company = request.session.get("selected_company") if request else None
for field in fields.values():
- if isinstance(field, ModelChoiceField):
- model_name = field.queryset.model.__name__
- filter_criteria = model_filters.get(model_name)
- if filter_criteria is not None:
- field.queryset = field.queryset.model.objects.filter(**filter_criteria)
- # Future updation for company select field options when select a comapany from navbar
- elif selected_company and not selected_company == "all":
- field.queryset = field.queryset.model.objects.filter(
- id=selected_company
- )
- else:
- field.queryset = field.queryset.model.objects.all()
+ if not isinstance(field, ModelChoiceField):
+ continue
+
+ model = field.queryset.model
+ model_name = model.__name__
+
+ if model_name == "Company" and selected_company and selected_company != "all":
+ field.queryset = model.objects.filter(id=selected_company)
+ elif (filters := model_filters.get(model_name)) is not None:
+ field.queryset = model.objects.filter(**filters)
+ else:
+ field.queryset = model.objects.all()
return fields
diff --git a/biometric/forms.py b/biometric/forms.py
index 0fb352d2a..28f22bb4c 100644
--- a/biometric/forms.py
+++ b/biometric/forms.py
@@ -10,8 +10,7 @@ from django import forms
from django.db.models import Q
from django.utils.translation import gettext_lazy as _
-from attendance.forms import ModelForm
-from base.forms import Form
+from base.forms import Form, ModelForm
from base.methods import reload_queryset
from employee.models import Employee
from horilla.horilla_middlewares import _thread_locals
diff --git a/biometric/templates/biometric/add_biometric_device.html b/biometric/templates/biometric/add_biometric_device.html
index 08a88a396..794d0d176 100644
--- a/biometric/templates/biometric/add_biometric_device.html
+++ b/biometric/templates/biometric/add_biometric_device.html
@@ -5,7 +5,7 @@
{% endif %}