diff --git a/asset/sidebar.py b/asset/sidebar.py index 847420d05..44296aa09 100644 --- a/asset/sidebar.py +++ b/asset/sidebar.py @@ -5,7 +5,6 @@ assets/sidebar.py from django.urls import reverse from django.utils.translation import gettext_lazy as trans - MENU = trans("Assets") IMG_SRC = "images/ui/assets.svg" diff --git a/attendance/sidebar.py b/attendance/sidebar.py index c53430650..5af9731e6 100644 --- a/attendance/sidebar.py +++ b/attendance/sidebar.py @@ -3,12 +3,12 @@ attendance/sidebar.py """ from datetime import datetime + from django.urls import reverse -from base.context_processors import biometric_app_exists -from base.templatetags.basefilters import is_reportingmanager from django.utils.translation import gettext_lazy as trans - +from base.context_processors import biometric_app_exists +from base.templatetags.basefilters import is_reportingmanager MENU = trans("Attendance") IMG_SRC = "images/ui/attendances.svg" @@ -20,12 +20,7 @@ SUBMENUS = [ "redirect": reverse("attendance-dashboard"), }, { - "menu": trans("Attendance View"), - "redirect": reverse("attendance-view"), - "accessibility": "attendance.sidebar.attendances_accessibility", - }, - { - "menu": trans("Attendance View"), + "menu": trans("Attendances"), "redirect": reverse("attendance-view"), "accessibility": "attendance.sidebar.attendances_accessibility", }, diff --git a/employee/sidebar.py b/employee/sidebar.py index 8682ecf1e..4b0a4149f 100644 --- a/employee/sidebar.py +++ b/employee/sidebar.py @@ -5,9 +5,9 @@ To set Horilla sidebar for employee """ from django.urls import reverse -from base.templatetags.basefilters import is_reportingmanager from django.utils.translation import gettext_lazy as trans +from base.templatetags.basefilters import is_reportingmanager MENU = trans("Employee") IMG_SRC = "images/ui/employees.svg" diff --git a/helpdesk/sidebar.py b/helpdesk/sidebar.py index 7e6985b12..7ae51013b 100644 --- a/helpdesk/sidebar.py +++ b/helpdesk/sidebar.py @@ -5,13 +5,12 @@ helpdesk/sidebar.py from django.urls import reverse from django.utils.translation import gettext_lazy as trans - MENU = trans("Help Desk") IMG_SRC = "images/ui/headset-solid.svg" SUBMENUS = [ { - "menu": trans("FAQa"), + "menu": trans("FAQs"), "redirect": reverse("faq-category-view"), }, { diff --git a/horilla/config.py b/horilla/config.py index 30959be0c..5c0a48b74 100644 --- a/horilla/config.py +++ b/horilla/config.py @@ -4,24 +4,19 @@ horilla/config.py Horilla app configurations """ -import os, importlib, logging +import importlib +import logging +import os + from django.conf import settings from django.contrib.auth.context_processors import PermWrapper + from horilla.horilla_apps import SIDEBARS logger = logging.getLogger(__name__) def get_apps_in_base_dir(): - base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - base_dir_apps = [] - - for app_name in settings.INSTALLED_APPS: - app_module = __import__(app_name) - app_path = os.path.dirname(os.path.abspath(app_module.__file__)) - if app_path.startswith(base_dir): - base_dir_apps.append(app_name) - return SIDEBARS diff --git a/leave/sidebar.py b/leave/sidebar.py index 2e4daecba..8a81aa177 100644 --- a/leave/sidebar.py +++ b/leave/sidebar.py @@ -3,10 +3,10 @@ leave/sidebar.py """ from django.urls import reverse -from base.templatetags.basefilters import is_leave_approval_manager, is_reportingmanager -from leave.templatetags.leavefilters import is_compensatory from django.utils.translation import gettext_lazy as trans +from base.templatetags.basefilters import is_leave_approval_manager, is_reportingmanager +from leave.templatetags.leavefilters import is_compensatory MENU = trans("Leave") IMG_SRC = "images/ui/leave.svg" diff --git a/offboarding/sidebar.py b/offboarding/sidebar.py index fedf61389..78311136c 100644 --- a/offboarding/sidebar.py +++ b/offboarding/sidebar.py @@ -4,13 +4,13 @@ offboarding/sidebar.py from django.urls import reverse from django.utils.translation import gettext_lazy as trans + from base.context_processors import resignation_request_enabled from offboarding.templatetags.offboarding_filter import ( any_manager, is_offboarding_employee, ) - MENU = trans("Offboarding") IMG_SRC = "images/ui/exit-outline.svg" ACCESSIBILITY = "offboarding.sidebar.offboarding_accessibility" diff --git a/onboarding/sidebar.py b/onboarding/sidebar.py index 113252bfc..0389ef398 100644 --- a/onboarding/sidebar.py +++ b/onboarding/sidebar.py @@ -4,10 +4,10 @@ onboarding/sidebar.py To set Horilla sidebar for onboarding """ -from django.urls import reverse from django.contrib.auth.context_processors import PermWrapper -from onboarding.templatetags.onboardingfilters import is_taskmanager +from django.urls import reverse +from onboarding.templatetags.onboardingfilters import is_taskmanager MENU = "Onboarding" ACCESSIBILITY = "onboarding.sidebar.menu_accessibilty" @@ -46,6 +46,6 @@ def onboarding_view_accessibility( def candidates_view_accessibility( - request, _submenu: dict = {}, user_perms: PermWrapper = [], * args, **kwargs + request, _submenu: dict = {}, user_perms: PermWrapper = [], *args, **kwargs ) -> bool: return request.user.has_perm("recruitment.view_candidate") diff --git a/payroll/sidebar.py b/payroll/sidebar.py index d70d93ee5..8d6cb8ec6 100644 --- a/payroll/sidebar.py +++ b/payroll/sidebar.py @@ -6,7 +6,6 @@ payroll/sidebar.py from django.urls import reverse from django.utils.translation import gettext_lazy as trans - MENU = trans("Payroll") IMG_SRC = "images/ui/wallet-outline.svg" diff --git a/pms/sidebar.py b/pms/sidebar.py index 565bc975a..559878892 100644 --- a/pms/sidebar.py +++ b/pms/sidebar.py @@ -3,9 +3,9 @@ pms/sidebar.py """ from django.urls import reverse -from base.templatetags.basefilters import is_reportingmanager from django.utils.translation import gettext_lazy as trans +from base.templatetags.basefilters import is_reportingmanager MENU = trans("Performance") IMG_SRC = "images/ui/pms.svg" @@ -51,4 +51,6 @@ def key_result_accessibility(request, submenu, user_perms, *args, **kwargs): def question_template_accessibility(request, submenu, user_perms, *args, **kwargs): - return request.user.has_perm("pms.view_questiontemplate") or is_reportingmanager(request.user) + return request.user.has_perm("pms.view_questiontemplate") or is_reportingmanager( + request.user + ) diff --git a/recruitment/sidebar.py b/recruitment/sidebar.py index 8dee799b6..df154fcf1 100644 --- a/recruitment/sidebar.py +++ b/recruitment/sidebar.py @@ -4,12 +4,12 @@ recruitment/sidebar.py To set Horilla sidebar for onboarding """ -from django.urls import reverse from django.contrib.auth.context_processors import PermWrapper -from recruitment.models import InterviewSchedule -from recruitment.templatetags.recruitmentfilters import is_stagemanager +from django.urls import reverse from django.utils.translation import gettext_lazy as trans +from recruitment.models import InterviewSchedule +from recruitment.templatetags.recruitmentfilters import is_stagemanager MENU = trans("Recruitment") ACCESSIBILITY = "recruitment.sidebar.menu_accessibilty"