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

Remove default duedates attrs & refactor

remotes/origin/3.4.0rc
Álex Hermida 2018-06-06 17:12:00 +02:00 committed by Alex Hermida
parent abeed336b5
commit fc511df8bc
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taiga/projects/admin.py
View File

@ -118,9 +118,9 @@ class ProjectAdmin(admin.ModelAdmin):
}),
(_("Default values"), {
"classes": ("collapse",),
"fields": (("default_us_status", "default_us_duedate", "default_points"),
("default_task_status", "default_task_duedate"),
("default_issue_status", "default_issue_duedate"),
"fields": (("default_us_status", "default_points"),
"default_task_status",
"default_issue_status",
("default_priority", "default_severity", "default_issue_type")),
}),
(_("Activity"), {

27
taiga/projects/migrations/0064_auto_20180606_1510.py Normal file
View File

@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2018-06-06 15:10
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('projects', '0063_auto_20180606_1111'),
]
operations = [
migrations.RemoveField(
model_name='project',
name='default_issue_duedate',
),
migrations.RemoveField(
model_name='project',
name='default_task_duedate',
),
migrations.RemoveField(
model_name='project',
name='default_us_duedate',
),
]

18
taiga/projects/models.py
View File

@ -120,20 +120,10 @@ class ProjectDefaults(models.Model):
default_points = models.OneToOneField("projects.Points", on_delete=models.SET_NULL,
related_name="+", null=True, blank=True,
verbose_name=_("default points"))
default_us_duedate = models.OneToOneField("projects.UserStoryDueDate",
on_delete=models.SET_NULL,
related_name="+",
null=True, blank=True,
verbose_name=_("default US duedate"))
default_task_status = models.OneToOneField("projects.TaskStatus",
on_delete=models.SET_NULL, related_name="+",
null=True, blank=True,
verbose_name=_("default task status"))
default_task_duedate = models.OneToOneField("projects.TaskDueDate",
on_delete=models.SET_NULL,
related_name="+",
null=True, blank=True,
verbose_name=_("default task duedate"))
default_priority = models.OneToOneField("projects.Priority", on_delete=models.SET_NULL,
related_name="+", null=True, blank=True,
verbose_name=_("default priority"))
@ -148,11 +138,6 @@ class ProjectDefaults(models.Model):
on_delete=models.SET_NULL, related_name="+",
null=True, blank=True,
verbose_name=_("default issue type"))
default_issue_duedate = models.OneToOneField("projects.IssueDueDate",
on_delete=models.SET_NULL,
related_name="+",
null=True, blank=True,
verbose_name=_("default issue duedate"))
class Meta:
abstract = True
@ -940,12 +925,9 @@ class ProjectTemplate(TaggedMixin, TagsColorsMixin, models.Model):
"points": getattr(project.default_points, "name", None),
"epic_status": getattr(project.default_epic_status, "name", None),
"us_status": getattr(project.default_us_status, "name", None),
"us_duedate": getattr(project.default_us_duedate, "name", None),
"task_status": getattr(project.default_task_status, "name", None),
"task_duedate": getattr(project.default_task_duedate, "name", None),
"issue_status": getattr(project.default_issue_status, "name", None),
"issue_type": getattr(project.default_issue_type, "name", None),
"issue_duedate": getattr(project.default_issue_duedate, "name", None),
"priority": getattr(project.default_priority, "name", None),
"severity": getattr(project.default_severity, "name", None)
}