diff --git a/accessibility/accessibility.py b/accessibility/accessibility.py index 870f65ff..c6d9854f 100644 --- a/accessibility/accessibility.py +++ b/accessibility/accessibility.py @@ -4,7 +4,6 @@ from django.utils.translation import gettext_lazy as _ - ACCESSBILITY_FEATURE = [ ("employee_view", _("Default Employee View")), ("employee_detailed_view", _("Default Employee Detailed View")), diff --git a/accessibility/filters.py b/accessibility/filters.py index 57f001a4..ed8d4ae9 100644 --- a/accessibility/filters.py +++ b/accessibility/filters.py @@ -3,13 +3,15 @@ """ from functools import reduce -from django.utils.translation import gettext as _ + +import django_filters from django.db.models import Q from django.template.loader import render_to_string -import django_filters +from django.utils.translation import gettext as _ + +from employee.models import Employee from horilla.filters import HorillaFilterSet from horilla.horilla_middlewares import _thread_locals -from employee.models import Employee def _filter_form_structured(self): @@ -95,7 +97,6 @@ def filter_queryset(self, queryset): else: or_conditions.append(Q(**{f"{field}__in": [field_value]})) - if or_conditions: queryset = queryset.filter(reduce(lambda x, y: x | y, or_conditions)) diff --git a/accessibility/models.py b/accessibility/models.py index f9cc132f..69a674bf 100644 --- a/accessibility/models.py +++ b/accessibility/models.py @@ -3,8 +3,9 @@ """ from django.db import models -from horilla.models import HorillaModel + from accessibility.accessibility import ACCESSBILITY_FEATURE +from horilla.models import HorillaModel class DefaultAccessibility(HorillaModel): diff --git a/accessibility/templates/accessibility/accessibility.html b/accessibility/templates/accessibility/accessibility.html index 4ddcbd90..7c2950fb 100644 --- a/accessibility/templates/accessibility/accessibility.html +++ b/accessibility/templates/accessibility/accessibility.html @@ -11,7 +11,7 @@