From a18ea70e3379a679234e6dc33656ed18f7096d14 Mon Sep 17 00:00:00 2001 From: Horilla Date: Fri, 28 Feb 2025 18:57:58 +0530 Subject: [PATCH] [UPDT] HORILLA API: Update model name in the serializers to new model name from attendance and leave --- horilla_api/api_serializers/attendance/serializers.py | 4 ++-- horilla_api/api_serializers/leave/serializers.py | 4 ++-- horilla_api/api_views/attendance/views.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/horilla_api/api_serializers/attendance/serializers.py b/horilla_api/api_serializers/attendance/serializers.py index 4ea070485..9c10d5598 100644 --- a/horilla_api/api_serializers/attendance/serializers.py +++ b/horilla_api/api_serializers/attendance/serializers.py @@ -1,7 +1,7 @@ from rest_framework import serializers from attendance.models import * -from recruitment.models import RecruitmentMailTemplate +from base.models import HorillaMailTemplate class AttendanceSerializer(serializers.ModelSerializer): @@ -208,5 +208,5 @@ class AttendanceActivitySerializer(serializers.ModelSerializer): class MailTemplateSerializer(serializers.ModelSerializer): class Meta: - model = RecruitmentMailTemplate + model = HorillaMailTemplate fields = "__all__" diff --git a/horilla_api/api_serializers/leave/serializers.py b/horilla_api/api_serializers/leave/serializers.py index ec4b5fa9e..3a5a36d46 100644 --- a/horilla_api/api_serializers/leave/serializers.py +++ b/horilla_api/api_serializers/leave/serializers.py @@ -460,13 +460,13 @@ class LeaveAllocationRequestGetSerializer(serializers.ModelSerializer): class CompanyLeaveSerializer(serializers.ModelSerializer): class Meta: - model = CompanyLeave + model = CompanyLeaves exclude = ["company_id"] class HoildaySerializer(serializers.ModelSerializer): class Meta: - model = Holiday + model = Holidays exclude = ["company_id"] def validate(self, data): diff --git a/horilla_api/api_views/attendance/views.py b/horilla_api/api_views/attendance/views.py index 0e0e213fb..a78e08238 100644 --- a/horilla_api/api_views/attendance/views.py +++ b/horilla_api/api_views/attendance/views.py @@ -23,8 +23,8 @@ from attendance.views.dashboard import ( from attendance.views.views import * from base.backends import ConfiguredEmailBackend from base.methods import generate_pdf, is_reportingmanager +from base.models import HorillaMailTemplate from employee.filters import EmployeeFilter -from recruitment.models import RecruitmentMailTemplate from ...api_decorators.base.decorators import ( manager_permission_required, @@ -827,7 +827,7 @@ class MailTemplateView(APIView): permission_classes = [IsAuthenticated] def get(self, request): - instances = RecruitmentMailTemplate.objects.all() + instances = HorillaMailTemplate.objects.all() serializer = MailTemplateSerializer(instances, many=True) return Response(serializer.data, status=200) @@ -846,7 +846,7 @@ class ConvertedMailTemplateConvert(APIView): template_id = request.data.get("template_id", None) employee_id = request.data.get("employee_id", None) employee = Employee.objects.filter(id=employee_id).first() - bdy = RecruitmentMailTemplate.objects.filter(id=template_id).first() + bdy = HorillaMailTemplate.objects.filter(id=template_id).first() template_bdy = template.Template(bdy.body) context = template.Context( {"instance": employee, "self": request.user.employee_get} @@ -878,7 +878,7 @@ class OfflineEmployeeMailsend(APIView): employee = Employee.objects.get(id=employee_id) template_attachment_ids = request.POST.getlist("template_attachments") bodys = list( - RecruitmentMailTemplate.objects.filter( + HorillaMailTemplate.objects.filter( id__in=template_attachment_ids ).values_list("body", flat=True) )