From 08b0a18419e97d81499125cd0d7040526e095f60 Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 9 Sep 2025 15:59:20 +0530 Subject: [PATCH] [UPDT] REPORT: Replaced the custom login_required and permission_required in report module views python file --- report/views/asset_report.py | 3 +-- report/views/attendance_report.py | 2 +- report/views/employee_report.py | 2 +- report/views/leave_report.py | 2 +- report/views/payroll_report.py | 2 +- report/views/pms_report.py | 2 +- report/views/recruitment_report.py | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/report/views/asset_report.py b/report/views/asset_report.py index fbec4c5ae..3a222a5a3 100644 --- a/report/views/asset_report.py +++ b/report/views/asset_report.py @@ -3,11 +3,10 @@ from django.http import JsonResponse from django.shortcuts import render if apps.is_installed("asset"): - from asset.filters import AssetFilter from asset.models import Asset from base.models import Company - from horilla_views.cbv_methods import login_required, permission_required + from horilla.decorators import login_required, permission_required @login_required @permission_required(perm="asset.view_asset") diff --git a/report/views/attendance_report.py b/report/views/attendance_report.py index 95f635f9a..b433276b2 100644 --- a/report/views/attendance_report.py +++ b/report/views/attendance_report.py @@ -9,7 +9,7 @@ if apps.is_installed("attendance"): from attendance.filters import AttendanceFilters from attendance.models import Attendance from base.models import Company - from horilla_views.cbv_methods import login_required, permission_required + from horilla.decorators import login_required, permission_required def convert_time_to_decimal_w(time_str): try: diff --git a/report/views/employee_report.py b/report/views/employee_report.py index 07c28adb4..ad3a3872b 100644 --- a/report/views/employee_report.py +++ b/report/views/employee_report.py @@ -4,7 +4,7 @@ from django.shortcuts import render from base.models import Company from employee.filters import EmployeeFilter from employee.models import Employee -from horilla_views.cbv_methods import login_required, permission_required +from horilla.decorators import login_required, permission_required @login_required diff --git a/report/views/leave_report.py b/report/views/leave_report.py index dafefe30e..48eddc2a9 100644 --- a/report/views/leave_report.py +++ b/report/views/leave_report.py @@ -5,7 +5,7 @@ from django.shortcuts import render if apps.is_installed("leave"): from base.models import Company - from horilla_views.cbv_methods import login_required, permission_required + from horilla.decorators import login_required, permission_required from leave.filters import AssignedLeaveFilter, LeaveRequestFilter from leave.models import AvailableLeave, LeaveRequest diff --git a/report/views/payroll_report.py b/report/views/payroll_report.py index 8c03aacdc..be7b1fc56 100644 --- a/report/views/payroll_report.py +++ b/report/views/payroll_report.py @@ -6,7 +6,7 @@ from django.utils.dateparse import parse_date if apps.is_installed("payroll"): from base.models import Company - from horilla_views.cbv_methods import login_required, permission_required + from horilla.decorators import login_required, permission_required from payroll.filters import PayslipFilter from payroll.models.models import Payslip diff --git a/report/views/pms_report.py b/report/views/pms_report.py index d5ab7147f..47cf444f2 100644 --- a/report/views/pms_report.py +++ b/report/views/pms_report.py @@ -5,7 +5,7 @@ from django.shortcuts import render if apps.is_installed("pms"): from base.models import Company - from horilla_views.cbv_methods import login_required, permission_required + from horilla.decorators import login_required, permission_required from pms.filters import EmployeeObjectiveFilter, FeedbackFilter from pms.models import EmployeeKeyResult, EmployeeObjective, Feedback, Objective from pms.views import objective_filter_pagination diff --git a/report/views/recruitment_report.py b/report/views/recruitment_report.py index 1dc90129b..461b23160 100644 --- a/report/views/recruitment_report.py +++ b/report/views/recruitment_report.py @@ -5,7 +5,7 @@ from django.shortcuts import render if apps.is_installed("recruitment"): from base.models import Company - from horilla_views.cbv_methods import login_required, permission_required + from horilla.decorators import login_required, permission_required from onboarding.filters import OnboardingStageFilter from onboarding.models import OnboardingStage from recruitment.filters import CandidateFilter, RecruitmentFilter