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

Add specific order fields for better handle of order in diffent sections.

remotes/origin/enhancement/email-actions
Andrey Antukh 2014-09-13 13:11:18 +02:00
parent 1b5c8a01f1
commit 92276a1589
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taiga/projects/history/freeze_impl.py
View File

@ -212,7 +212,9 @@ def userstory_freezer(us) -> dict:
"status": us.status_id, "status": us.status_id,
"is_closed": us.is_closed, "is_closed": us.is_closed,
"finish_date": str(us.finish_date), "finish_date": str(us.finish_date),
"order": us.order, "backlog_order": us.backlog_order,
"sprint_order": us.sprint_order,
"kanban_order": us.kanban_order,
"subject": us.subject, "subject": us.subject,
"description": us.description, "description": us.description,
"description_html": mdrender(us.project, us.description), "description_html": mdrender(us.project, us.description),
@ -263,6 +265,8 @@ def task_freezer(task) -> dict:
"assigned_to": task.assigned_to_id, "assigned_to": task.assigned_to_id,
"watchers": [x.pk for x in task.watchers.all()], "watchers": [x.pk for x in task.watchers.all()],
"attachments": extract_attachments(task), "attachments": extract_attachments(task),
"taskboard_order": task.taskboard_order,
"us_order": task.us_order,
"tags": task.tags, "tags": task.tags,
"user_story": task.user_story_id, "user_story": task.user_story_id,
"is_iocaine": task.is_iocaine, "is_iocaine": task.is_iocaine,

6
taiga/projects/tasks/models.py
View File

@ -55,6 +55,12 @@ class Task(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, models.M
verbose_name=_("finished date")) verbose_name=_("finished date"))
subject = models.TextField(null=False, blank=False, subject = models.TextField(null=False, blank=False,
verbose_name=_("subject")) verbose_name=_("subject"))
us_order = models.IntegerField(null=False, blank=False, default=1,
verbose_name=_("us order"))
taskboard_order = models.IntegerField(null=False, blank=False, default=1,
verbose_name=_("taskboard order"))
description = models.TextField(null=False, blank=True, verbose_name=_("description")) description = models.TextField(null=False, blank=True, verbose_name=_("description"))
assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
default=None, related_name="tasks_assigned_to_me", default=None, related_name="tasks_assigned_to_me",

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

@ -73,8 +73,14 @@ class UserStory(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, mod
points = models.ManyToManyField("projects.Points", null=False, blank=False, points = models.ManyToManyField("projects.Points", null=False, blank=False,
related_name="userstories", through="RolePoints", related_name="userstories", through="RolePoints",
verbose_name=_("points")) verbose_name=_("points"))
order = models.PositiveSmallIntegerField(null=False, blank=False, default=100,
verbose_name=_("order")) backlog_order = models.IntegerField(null=False, blank=False, default=1,
verbose_name=_("backlog order"))
sprint_order = models.IntegerField(null=False, blank=False, default=1,
verbose_name=_("sprint order"))
kanban_order = models.IntegerField(null=False, blank=False, default=1,
verbose_name=_("sprint order"))
created_date = models.DateTimeField(null=False, blank=False, created_date = models.DateTimeField(null=False, blank=False,
verbose_name=_("created date"), verbose_name=_("created date"),
default=timezone.now) default=timezone.now)
@ -101,7 +107,7 @@ class UserStory(OCCModelMixin, WatchedModelMixin, BlockedMixin, TaggedMixin, mod
class Meta: class Meta:
verbose_name = "user story" verbose_name = "user story"
verbose_name_plural = "user stories" verbose_name_plural = "user stories"
ordering = ["project", "order", "ref"] ordering = ["project", "backlog_order", "ref"]
#unique_together = ("ref", "project") #unique_together = ("ref", "project")
permissions = ( permissions = (
("view_userstory", "Can view user story"), ("view_userstory", "Can view user story"),