github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue ordering for priority and updated_by parameters (#1142)

Browse Source
This commit is contained in:
pablohashescobar 2023-05-26 13:51:09 +05:30 committed by GitHub
parent b6321438ce
commit f80b3f1eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/plane/api/serializers/issue.py
View File

@ -1,3 +1,6 @@
# Django imports
from django.utils import timezone
# Third Party imports # Third Party imports
from rest_framework import serializers from rest_framework import serializers
@ -251,6 +254,7 @@ class IssueCreateSerializer(BaseSerializer):
batch_size=10, batch_size=10,
) )
instance.updated_at = timezone.now()
return super().update(instance, validated_data) return super().update(instance, validated_data)

42
apiserver/plane/api/views/issue.py
View File

@ -4,12 +4,24 @@ import random
from itertools import chain from itertools import chain
# Django imports # Django imports
from django.db.models import Prefetch, OuterRef, Func, F, Q, Count from django.db.models import (
Prefetch,
OuterRef,
Func,
F,
Q,
Count,
Case,
Value,
CharField,
When,
)
from django.core.serializers.json import DjangoJSONEncoder from django.core.serializers.json import DjangoJSONEncoder
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.views.decorators.gzip import gzip_page from django.views.decorators.gzip import gzip_page
from django.db.models.functions import Coalesce from django.db.models.functions import Coalesce
from django.conf import settings from django.conf import settings
# Third Party imports # Third Party imports
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework import status from rest_framework import status
@ -144,9 +156,13 @@ class IssueViewSet(BaseViewSet):
filters = issue_filters(request.query_params, "GET") filters = issue_filters(request.query_params, "GET")
show_sub_issues = request.GET.get("show_sub_issues", "true") show_sub_issues = request.GET.get("show_sub_issues", "true")
# Custom ordering for priority
priority_order = ["urgent", "high", "medium", "low", None]
order_by_param = request.GET.get("order_by", "-created_at")
issue_queryset = ( issue_queryset = (
self.get_queryset() self.get_queryset()
.order_by(request.GET.get("order_by", "created_at"))
.filter(**filters) .filter(**filters)
.annotate(cycle_id=F("issue_cycle__id")) .annotate(cycle_id=F("issue_cycle__id"))
.annotate(module_id=F("issue_module__id")) .annotate(module_id=F("issue_module__id"))
@ -166,6 +182,19 @@ class IssueViewSet(BaseViewSet):
) )
) )
if order_by_param == "priority":
issue_queryset = issue_queryset.annotate(
priority_order=Case(
*[
When(priority=p, then=Value(i))
for i, p in enumerate(priority_order)
],
output_field=CharField(),
)
).order_by("priority_order")
else:
issue_queryset = issue_queryset.order_by(order_by_param)
issue_queryset = ( issue_queryset = (
issue_queryset issue_queryset
if show_sub_issues == "true" if show_sub_issues == "true"
@ -789,8 +818,13 @@ class IssueAttachmentEndpoint(BaseAPIView):
if serializer.is_valid(): if serializer.is_valid():
serializer.save(project_id=project_id, issue_id=issue_id) serializer.save(project_id=project_id, issue_id=issue_id)
response_data = serializer.data response_data = serializer.data
if settings.DOCKERIZED and settings.AWS_S3_ENDPOINT_URL in response_data["asset"]: if (
response_data["asset"] = response_data["asset"].replace(settings.AWS_S3_ENDPOINT_URL, settings.WEB_URL) settings.DOCKERIZED
and settings.AWS_S3_ENDPOINT_URL in response_data["asset"]
):
response_data["asset"] = response_data["asset"].replace(
settings.AWS_S3_ENDPOINT_URL, settings.WEB_URL
)
issue_activity.delay( issue_activity.delay(
type="attachment.activity.created", type="attachment.activity.created",
requested_data=None, requested_data=None,