[UPDT] ACCESSIBILITY: Add accessibility to diff app
This commit is contained in:
@@ -4,7 +4,6 @@ accessibility/accessibility.py
|
||||
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
|
||||
ACCESSBILITY_FEATURE = [
|
||||
("employee_view", _("Default Employee View")),
|
||||
("employee_detailed_view", _("Default Employee Detailed View")),
|
||||
|
||||
@@ -3,13 +3,15 @@ accessibility/filters.py
|
||||
"""
|
||||
|
||||
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 @@ class AccessibilityFilter(HorillaFilterSet):
|
||||
else:
|
||||
or_conditions.append(Q(**{f"{field}__in": [field_value]}))
|
||||
|
||||
|
||||
if or_conditions:
|
||||
queryset = queryset.filter(reduce(lambda x, y: x | y, or_conditions))
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@ accessibility/models.py
|
||||
"""
|
||||
|
||||
from django.db import models
|
||||
from horilla.models import HorillaModel
|
||||
|
||||
from accessibility.accessibility import ACCESSBILITY_FEATURE
|
||||
from horilla.models import HorillaModel
|
||||
|
||||
|
||||
class DefaultAccessibility(HorillaModel):
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<span class="oh-info mr-2 mb-2" title="{% trans "Limit default view access to horilla feature" %}">
|
||||
</span>
|
||||
</h2>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="oh-card" id="accessibilityContainer">
|
||||
<div class="oh-accordion-meta">
|
||||
@@ -89,7 +89,7 @@
|
||||
if (response.hasOwnProperty(key)) {
|
||||
let values = response[key];
|
||||
let field = document.querySelector(`#{{accessibility}}_body [name="${key}"]`);
|
||||
|
||||
|
||||
if (field) {
|
||||
// Handle select fields
|
||||
if (field.tagName === 'SELECT') {
|
||||
@@ -110,7 +110,7 @@
|
||||
select = $("#accessibilityContainer #{{accessibility}}_body").find("select")
|
||||
select.parent().find('span').remove()
|
||||
select.select2()
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
</div>
|
||||
<script>
|
||||
// Save the filter form while change the filter form
|
||||
$("#accessibilityContainer select").change(function (e) {
|
||||
$("#accessibilityContainer select").change(function (e) {
|
||||
$(this).parent().closest("form").find("input[type=submit]").click();
|
||||
});
|
||||
$(document).mouseup(function(e) {
|
||||
@@ -143,4 +143,4 @@
|
||||
});
|
||||
|
||||
</script>
|
||||
{% endblock settings %}
|
||||
{% endblock settings %}
|
||||
|
||||
@@ -3,8 +3,8 @@ accessibility/urls.py
|
||||
"""
|
||||
|
||||
from django.urls import path
|
||||
from accessibility import views as accessibility
|
||||
|
||||
from accessibility import views as accessibility
|
||||
|
||||
urlpatterns = [
|
||||
path(
|
||||
|
||||
@@ -4,14 +4,15 @@ employee/accessibility.py
|
||||
Employee accessibility related methods and functionalites
|
||||
"""
|
||||
|
||||
from django.shortcuts import render
|
||||
from django.contrib import messages
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.http import HttpResponse, JsonResponse
|
||||
from horilla.decorators import login_required, permission_required
|
||||
from django.shortcuts import render
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from accessibility.accessibility import ACCESSBILITY_FEATURE
|
||||
from accessibility.filters import AccessibilityFilter
|
||||
from accessibility.models import DefaultAccessibility
|
||||
from accessibility.accessibility import ACCESSBILITY_FEATURE
|
||||
from horilla.decorators import login_required, permission_required
|
||||
|
||||
|
||||
@login_required
|
||||
|
||||
Reference in New Issue
Block a user