From 783dca147265c57e6d0cdd8dec9a7c1e2f7ca610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 29 Jul 2016 18:56:33 +0200 Subject: [PATCH] Minor fixes --- taiga/projects/epics/models.py | 12 ++++++------ taiga/projects/milestones/utils.py | 4 ++++ taiga/projects/userstories/services.py | 4 ++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/taiga/projects/epics/models.py b/taiga/projects/epics/models.py index 6b7d9231..eb18c6c4 100644 --- a/taiga/projects/epics/models.py +++ b/taiga/projects/epics/models.py @@ -76,6 +76,12 @@ class Epic(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, models.M verbose_name_plural = "epics" ordering = ["project", "epics_order", "ref"] + def __str__(self): + return "#{0} {1}".format(self.ref, self.subject) + + def __repr__(self): + return "" % (self.id) + def save(self, *args, **kwargs): if not self._importing or not self.modified_date: self.modified_date = timezone.now() @@ -85,12 +91,6 @@ class Epic(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, models.M super().save(*args, **kwargs) - def __str__(self): - return "#{0} {1}".format(self.ref, self.subject) - - def __repr__(self): - return "" % (self.id) - class RelatedUserStory(models.Model): user_story = models.ForeignKey("userstories.UserStory", on_delete=models.CASCADE) diff --git a/taiga/projects/milestones/utils.py b/taiga/projects/milestones/utils.py index b292b1bd..bea1cf12 100644 --- a/taiga/projects/milestones/utils.py +++ b/taiga/projects/milestones/utils.py @@ -80,6 +80,8 @@ def attach_extra_info(queryset, user=None): us_queryset = userstories_utils.attach_total_points(us_queryset) us_queryset = userstories_utils.attach_role_points(us_queryset) + us_queryset = userstories_utils.attach_epics(us_queryset) + us_queryset = attach_total_voters_to_queryset(us_queryset) us_queryset = attach_watchers_to_queryset(us_queryset) us_queryset = attach_total_watchers_to_queryset(us_queryset) @@ -87,6 +89,7 @@ def attach_extra_info(queryset, user=None): us_queryset = attach_is_watcher_to_queryset(us_queryset, user) queryset = queryset.prefetch_related(Prefetch("user_stories", queryset=us_queryset)) + queryset = attach_total_points(queryset) queryset = attach_closed_points(queryset) @@ -95,4 +98,5 @@ def attach_extra_info(queryset, user=None): queryset = attach_total_watchers_to_queryset(queryset) queryset = attach_is_voter_to_queryset(queryset, user) queryset = attach_is_watcher_to_queryset(queryset, user) + return queryset diff --git a/taiga/projects/userstories/services.py b/taiga/projects/userstories/services.py index 11fb2a2f..5998a57e 100644 --- a/taiga/projects/userstories/services.py +++ b/taiga/projects/userstories/services.py @@ -469,6 +469,8 @@ def _get_userstories_epics(project, queryset): FROM "epics_relateduserstory" INNER JOIN "userstories_userstory" ON ("userstories_userstory"."id" = "epics_relateduserstory"."user_story_id") + INNER JOIN "projects_project" + ON ("userstories_userstory"."project_id" = "projects_project"."id") WHERE {where} GROUP BY "epics_relateduserstory"."epic_id" ) @@ -492,6 +494,8 @@ def _get_userstories_epics(project, queryset): FROM "userstories_userstory" LEFT OUTER JOIN "epics_relateduserstory" ON ("epics_relateduserstory"."user_story_id" = "userstories_userstory"."id") + INNER JOIN "projects_project" + ON ("userstories_userstory"."project_id" = "projects_project"."id") WHERE {where} AND "epics_relateduserstory"."epic_id" IS NULL GROUP BY "epics_relateduserstory"."epic_id" """.format(where=where)