From 3c6e5ba509f059e87e0944dbc109eecb9e6750c9 Mon Sep 17 00:00:00 2001 From: shaikhmudassir Date: Sun, 14 Jan 2024 19:36:47 +0530 Subject: [PATCH 1/2] Unnecessary Semicolon removed --- leads/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leads/views.py b/leads/views.py index 67e263bc..d6323d71 100644 --- a/leads/views.py +++ b/leads/views.py @@ -764,7 +764,7 @@ class CompaniesView(APIView): tags=["Company"],description="Company Create",parameters=swagger_params1.organization_params,request=CompanySwaggerSerializer ) def post(self, request, *args, **kwargs): - request.data['org'] = request.profile.org.id; + request.data['org'] = request.profile.org.id print(request.data) company=CompanySerializer(data=request.data) if Company.objects.filter(**request.data).exists(): From 92728e115adcccb6119305e45eee1f99009f9ea6 Mon Sep 17 00:00:00 2001 From: shaikhmudassir Date: Thu, 15 Feb 2024 14:12:44 +0530 Subject: [PATCH 2/2] Attachment issue fixed --- common/models.py | 2 +- leads/views.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/models.py b/common/models.py index 3eb9e5d2..aebcc355 100644 --- a/common/models.py +++ b/common/models.py @@ -345,7 +345,7 @@ class CommentFiles(BaseModel): class Attachments(BaseModel): created_by = models.ForeignKey( - Profile, + User, related_name="attachment_created_by", on_delete=models.SET_NULL, null=True, diff --git a/leads/views.py b/leads/views.py index d6323d71..fcd7f03a 100644 --- a/leads/views.py +++ b/leads/views.py @@ -36,6 +36,7 @@ from leads.serializer import ( CreateLeadFromSiteSwaggerSerializer, LeadUploadSwaggerSerializer ) +from common.models import User from leads.tasks import ( create_lead_from_file, send_email_to_assigned_user, @@ -392,7 +393,7 @@ class LeadDetailView(APIView): if self.request.FILES.get("lead_attachment"): attachment = Attachments() - attachment.created_by = self.request.profile.user + attachment.created_by = User.objects.get(id=self.request.profile.user.id) attachment.file_name = self.request.FILES.get("lead_attachment").name attachment.lead = self.lead_obj