From 3927c354e09989d72cee907136ae0e80e3d0aeb8 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 20 Apr 2014 03:43:51 +0200 Subject: [PATCH] Cosmetic fixes on choices and models of projects app. --- taiga/projects/choices.py | 62 +++++++++++++++++++-------------------- taiga/projects/models.py | 15 +++++----- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/taiga/projects/choices.py b/taiga/projects/choices.py index 47c9641e..f33b009d 100644 --- a/taiga/projects/choices.py +++ b/taiga/projects/choices.py @@ -22,52 +22,52 @@ TASK_STATUSES = ( ) POINTS_CHOICES = ( - (1, u'?', None, True), - (2, u'0', 0, False), - (3, u'1/2', 0.5, False), - (4, u'1', 1, False), - (5, u'2', 2, False), - (6, u'3', 3, False), - (7, u'5', 5, False), - (8, u'8', 8, False), - (9, u'10', 10, False), - (10, u'15', 15, False), - (11, u'20', 20, False), - (12, u'40', 40, False), + (1, u"?", None, True), + (2, u"0", 0, False), + (3, u"1/2", 0.5, False), + (4, u"1", 1, False), + (5, u"2", 2, False), + (6, u"3", 3, False), + (7, u"5", 5, False), + (8, u"8", 8, False), + (9, u"10", 10, False), + (10, u"15", 15, False), + (11, u"20", 20, False), + (12, u"40", 40, False), ) PRIORITY_CHOICES = ( - (1, _(u'Low'), '#666666', False), - (3, _(u'Normal'), '#669933', True), - (5, _(u'High'), '#CC0000', False), + (1, _(u"Low"), "#666666", False), + (3, _(u"Normal"), "#669933", True), + (5, _(u"High"), "#CC0000", False), ) SEVERITY_CHOICES = ( - (1, _(u'Wishlist'), '#666666', False), - (2, _(u'Minor'), '#669933', False), - (3, _(u'Normal'), '#0000FF', True), - (4, _(u'Important'), '#FFA500', False), - (5, _(u'Critical'), '#CC0000', False), + (1, _(u"Wishlist"), "#666666", False), + (2, _(u"Minor"), "#669933", False), + (3, _(u"Normal"), "#0000FF", True), + (4, _(u"Important"), "#FFA500", False), + (5, _(u"Critical"), "#CC0000", False), ) ISSUE_STATUSES = ( - (1, _("New"), False, '#8C2318', True), - (2, _("In progress"), False, '#5E8C6A', False), - (3, _("Ready for test"), True, '#88A65E', False), - (4, _("Closed"), True, '#BFB35A', False), - (5, _("Needs Info"), False, '#89BAB4', False), - (6, _("Rejected"), True, '#CC0000', False), - (7, _("Postponed"), False, '#666666', False), + (1, _("New"), False, "#8C2318", True), + (2, _("In progress"), False, "#5E8C6A", False), + (3, _("Ready for test"), True, "#88A65E", False), + (4, _("Closed"), True, "#BFB35A", False), + (5, _("Needs Info"), False, "#89BAB4", False), + (6, _("Rejected"), True, "#CC0000", False), + (7, _("Postponed"), False, "#666666", False), ) ISSUE_TYPES = ( - (1, _(u'Bug'), '#89BAB4', True), + (1, _(u"Bug"), "#89BAB4", True), ) QUESTION_STATUS = ( - (1, _("Pending"), False, '#FFA500', True), - (2, _("Answered"), False, '#669933', False), - (3, _("Closed"), True,'#BFB35A', False), + (1, _("Pending"), False, "#FFA500", True), + (2, _("Answered"), False, "#669933", False), + (3, _("Closed"), True,"#BFB35A", False), ) ROLES = ( diff --git a/taiga/projects/models.py b/taiga/projects/models.py index 72aa8c41..ad98f89a 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import itertools -import collections import time +import reversion from django.core.exceptions import ValidationError from django.db import models @@ -17,7 +17,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from picklefield.fields import PickledObjectField -import reversion from taiga.domains.models import DomainMember from taiga.projects.userstories.models import UserStory @@ -94,6 +93,7 @@ class ProjectDefaults(models.Model): related_name="+", null=True, blank=True, verbose_name=_("default questions " "status")) + class Meta: abstract = True @@ -132,14 +132,14 @@ class Project(ProjectDefaults, models.Model): is_kanban_activated = models.BooleanField(default=False, null=False, blank=True, verbose_name=_("active kanban panel")) is_wiki_activated = models.BooleanField(default=True, null=False, blank=True, - verbose_name=_("active wiki panel")) + verbose_name=_("active wiki panel")) is_issues_activated = models.BooleanField(default=True, null=False, blank=True, verbose_name=_("active issues panel")) videoconferences = models.CharField(max_length=250, null=True, blank=True, choices=choices.VIDEOCONFERENCES_CHOICES, verbose_name=_("videoconference system")) videoconferences_salt = models.CharField(max_length=250, null=True, blank=True, - verbose_name=_("videoconference room salt")) + verbose_name=_("videoconference room salt")) domain = models.ForeignKey("domains.Domain", related_name="projects", null=True, blank=True, default=None, verbose_name=_("domain")) @@ -231,13 +231,13 @@ class Project(ProjectDefaults, models.Model): @property def future_team_increment(self): team_increment = self._get_points_increment(False, True) - shared_increment = {key: value/2 for key, value in self.future_shared_increment.items()} + shared_increment = {key: value / 2 for key, value in self.future_shared_increment.items()} return dict_sum(team_increment, shared_increment) @property def future_client_increment(self): client_increment = self._get_points_increment(True, False) - shared_increment = {key: value/2 for key, value in self.future_shared_increment.items()} + shared_increment = {key: value / 2 for key, value in self.future_shared_increment.items()} return dict_sum(client_increment, shared_increment) @property @@ -505,7 +505,6 @@ class QuestionStatus(models.Model): reversion.register(Project) reversion.register(Attachment) - # On membership object is created/changed, update # role-points relation. @receiver(models.signals.post_save, sender=Membership, @@ -601,7 +600,7 @@ def project_post_save(sender, instance, created, **kwargs): instance.default_question_status = obj # Permissions - for order, slug, name, computable, permissions in choices.ROLES: + for order, slug, name, computable, permissions in choices.ROLES: obj = Role.objects.create(slug=slug, name=name, order=order, computable=computable, project=instance) for permission in permissions: try: