Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: email notification assignees (#3762)

Bavisetti Narayan1f7565ce52a8
diff --git a/apiserver/plane/app/serializers/issue.py b/apiserver/plane/app/serializers/issue.py
index 8d4304f92a..411c5b73f8 100644
--- a/apiserver/plane/app/serializers/issue.py
+++ b/apiserver/plane/app/serializers/issue.py
@@ -601,15 +601,15 @@ class IssueSerializer(DynamicBaseSerializer):
# ids
cycle_id = serializers.PrimaryKeyRelatedField(read_only=True)
module_ids = serializers.ListField(
- child=serializers.UUIDField(), required=False, allow_null=True
+ child=serializers.UUIDField(), required=False,
)
# Many to many
label_ids = serializers.ListField(
- child=serializers.UUIDField(), required=False, allow_null=True
+ child=serializers.UUIDField(), required=False,
)
assignee_ids = serializers.ListField(
- child=serializers.UUIDField(), required=False, allow_null=True
+ child=serializers.UUIDField(), required=False,
)
# Count items
diff --git a/apiserver/plane/app/views/inbox.py b/apiserver/plane/app/views/inbox.py
index 85e2f38b23..d70eec4f22 100644
--- a/apiserver/plane/app/views/inbox.py
+++ b/apiserver/plane/app/views/inbox.py
@@ -296,11 +296,7 @@ class InboxIssueViewSet(BaseViewSet):
issue_data = request.data.pop("issue", False)
if bool(issue_data):
- issue = Issue.objects.get(
- pk=inbox_issue.issue_id,
- workspace__slug=slug,
- project_id=project_id,
- )
+ issue = self.get_queryset().filter(pk=inbox_issue.issue_id).first()
# Only allow guests and viewers to edit name and description
if project_member.role <= 10:
# viewers and guests since only viewers and guests
diff --git a/apiserver/plane/app/views/issue.py b/apiserver/plane/app/views/issue.py
index 9f95c9b431..25c42dc5b3 100644
--- a/apiserver/plane/app/views/issue.py
+++ b/apiserver/plane/app/views/issue.py
@@ -572,12 +572,18 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
return Response(serializer.data, status=status.HTTP_200_OK)
def partial_update(self, request, slug, project_id, pk=None):
- issue = Issue.objects.get(
- workspace__slug=slug, project_id=project_id, pk=pk
- )
+ issue = self.get_queryset().filter(pk=pk).first()
+
+ if not issue:
+ return Response(
+ {"error": "Issue not found"},
+ status=status.HTTP_404_NOT_FOUND,
+ )
+
current_instance = json.dumps(
IssueSerializer(issue).data, cls=DjangoJSONEncoder
)
+
requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
serializer = IssueCreateSerializer(
issue, data=request.data, partial=True
@@ -2296,9 +2302,14 @@ class IssueDraftViewSet(BaseViewSet):
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
def partial_update(self, request, slug, project_id, pk):
- issue = Issue.objects.get(
- workspace__slug=slug, project_id=project_id, pk=pk
- )
+ issue = self.get_queryset().filter(pk=pk).first()
+
+ if not issue:
+ return Response(
+ {"error": "Issue does not exist"},
+ status=status.HTTP_404_NOT_FOUND,
+ )
+
serializer = IssueSerializer(issue, data=request.data, partial=True)
if serializer.is_valid():
diff --git a/apiserver/plane/bgtasks/email_notification_task.py b/apiserver/plane/bgtasks/email_notification_task.py
index 617bfcfdc6..2a98c6b332 100644
--- a/apiserver/plane/bgtasks/email_notification_task.py
+++ b/apiserver/plane/bgtasks/email_notification_task.py
@@ -10,6 +10,7 @@ from django.utils import timezone
from django.core.mail import EmailMultiAlternatives, get_connection
from django.template.loader import render_to_string
from django.utils.html import strip_tags
+from django.conf import settings
# Module imports
from plane.db.models import EmailNotificationLog, User, Issue
@@ -301,5 +302,7 @@ def send_email_notification(
print("Duplicate task recived. Skipping...")
return
except (Issue.DoesNotExist, User.DoesNotExist) as e:
+ if settings.DEBUG:
+ print(e)
release_lock(lock_id=lock_id)
return