Skip to content

Commit

Permalink
[UPDT] ACCESSIBILITY: Add accessibility to diff app
Browse files Browse the repository at this point in the history
  • Loading branch information
horilla-opensource committed Sep 19, 2024
1 parent 2f1a7f9 commit d479dee
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
1 change: 0 additions & 1 deletion accessibility/accessibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand Down
9 changes: 5 additions & 4 deletions accessibility/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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))

Expand Down
3 changes: 2 additions & 1 deletion accessibility/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 5 additions & 5 deletions accessibility/templates/accessibility/accessibility.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h2 class="oh-inner-sidebar-content__title oh-label__info">
<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">
Expand Down Expand Up @@ -89,7 +89,7 @@ <h2 class="oh-inner-sidebar-content__title oh-label__info">
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') {
Expand All @@ -110,7 +110,7 @@ <h2 class="oh-inner-sidebar-content__title oh-label__info">
select = $("#accessibilityContainer #{{accessibility}}_body").find("select")
select.parent().find('span').remove()
select.select2()

}
});

Expand All @@ -124,7 +124,7 @@ <h2 class="oh-inner-sidebar-content__title oh-label__info">
</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) {
Expand All @@ -143,4 +143,4 @@ <h2 class="oh-inner-sidebar-content__title oh-label__info">
});

</script>
{% endblock settings %}
{% endblock settings %}
2 changes: 1 addition & 1 deletion accessibility/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"""

from django.urls import path
from accessibility import views as accessibility

from accessibility import views as accessibility

urlpatterns = [
path(
Expand Down
9 changes: 5 additions & 4 deletions accessibility/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
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
Expand Down

0 comments on commit d479dee

Please sign in to comment.