taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fixes

remotes/origin/issue/4795/notification_even_they_are_disabled
David Barragán Merino 2016-07-29 18:56:33 +02:00
parent 133cf149fd
commit 783dca1472
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taiga/projects/epics/models.py
View File

@ -76,6 +76,12 @@ class Epic(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, models.M
verbose_name_plural = "epics" verbose_name_plural = "epics"
ordering = ["project", "epics_order", "ref"] ordering = ["project", "epics_order", "ref"]
def __str__(self):
return "#{0} {1}".format(self.ref, self.subject)
def __repr__(self):
return "<Epic %s>" % (self.id)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self._importing or not self.modified_date: if not self._importing or not self.modified_date:
self.modified_date = timezone.now() self.modified_date = timezone.now()
@ -85,12 +91,6 @@ class Epic(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, models.M
super().save(*args, **kwargs) super().save(*args, **kwargs)
def __str__(self):
return "#{0} {1}".format(self.ref, self.subject)
def __repr__(self):
return "<Epic %s>" % (self.id)
class RelatedUserStory(models.Model): class RelatedUserStory(models.Model):
user_story = models.ForeignKey("userstories.UserStory", on_delete=models.CASCADE) user_story = models.ForeignKey("userstories.UserStory", on_delete=models.CASCADE)

4
taiga/projects/milestones/utils.py
View File

@ -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_total_points(us_queryset)
us_queryset = userstories_utils.attach_role_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_total_voters_to_queryset(us_queryset)
us_queryset = attach_watchers_to_queryset(us_queryset) us_queryset = attach_watchers_to_queryset(us_queryset)
us_queryset = attach_total_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) us_queryset = attach_is_watcher_to_queryset(us_queryset, user)
queryset = queryset.prefetch_related(Prefetch("user_stories", queryset=us_queryset)) queryset = queryset.prefetch_related(Prefetch("user_stories", queryset=us_queryset))
queryset = attach_total_points(queryset) queryset = attach_total_points(queryset)
queryset = attach_closed_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_total_watchers_to_queryset(queryset)
queryset = attach_is_voter_to_queryset(queryset, user) queryset = attach_is_voter_to_queryset(queryset, user)
queryset = attach_is_watcher_to_queryset(queryset, user) queryset = attach_is_watcher_to_queryset(queryset, user)
return queryset return queryset

4
taiga/projects/userstories/services.py
View File

@ -469,6 +469,8 @@ def _get_userstories_epics(project, queryset):
FROM "epics_relateduserstory" FROM "epics_relateduserstory"
INNER JOIN "userstories_userstory" INNER JOIN "userstories_userstory"
ON ("userstories_userstory"."id" = "epics_relateduserstory"."user_story_id") ON ("userstories_userstory"."id" = "epics_relateduserstory"."user_story_id")
INNER JOIN "projects_project"
ON ("userstories_userstory"."project_id" = "projects_project"."id")
WHERE {where} WHERE {where}
GROUP BY "epics_relateduserstory"."epic_id" GROUP BY "epics_relateduserstory"."epic_id"
) )
@ -492,6 +494,8 @@ def _get_userstories_epics(project, queryset):
FROM "userstories_userstory" FROM "userstories_userstory"
LEFT OUTER JOIN "epics_relateduserstory" LEFT OUTER JOIN "epics_relateduserstory"
ON ("epics_relateduserstory"."user_story_id" = "userstories_userstory"."id") 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 WHERE {where} AND "epics_relateduserstory"."epic_id" IS NULL
GROUP BY "epics_relateduserstory"."epic_id" GROUP BY "epics_relateduserstory"."epic_id"
""".format(where=where) """.format(where=where)