From deece59b6bd400261aa71d6e66a33ea80eb7269d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 17 May 2017 12:50:28 +0200 Subject: [PATCH] Fixing ordering in archived states --- taiga/projects/userstories/api.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index e536b8e6..490df3e6 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -18,6 +18,7 @@ from django.apps import apps from django.db import transaction +from django.db.models import Max from django.utils.translation import ugettext as _ from django.http import HttpResponse @@ -156,6 +157,10 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi related_data = getattr(obj, "_related_data", {}) self._role_points = related_data.pop("role_points", None) + if obj.kanban_order == -1: + if self._max_order: + obj.kanban_order = self._max_order + 1; + if not obj.id: obj.owner = self.request.user else: @@ -276,6 +281,12 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi except Project.DoesNotExist: return response.BadRequest(_("The project doesn't exist")) + if self.object and self.object.project_id: + self._max_order = models.UserStory.objects.filter( + project_id=self.object.project_id, + status_id=request.DATA.get('status', None) + ).aggregate(Max('kanban_order'))['kanban_order__max'] + return super().update(request, *args, **kwargs) @list_route(methods=["GET"])