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

Move videoconference choices from project models to choices modules.

remotes/origin/enhancement/email-actions
Andrey Antukh 2014-04-20 03:43:21 +02:00
parent 2ad28a56c7
commit 30a1e58cfb
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
taiga/projects/choices.py
View File

@ -3,6 +3,11 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
VIDEOCONFERENCES_CHOICES = (
("appear-in", "AppearIn"),
("talky", "Talky"),
)
US_STATUSES = ( US_STATUSES = (
(1, _("Open"), False, True, "#669933"), (1, _("Open"), False, True, "#669933"),
(2, _("Closed"), True, False, "#999999"), (2, _("Closed"), True, False, "#999999"),

8
taiga/projects/models.py
View File

@ -28,12 +28,6 @@ from taiga.base.users.models import Role
from . import choices from . import choices
VIDEOCONFERENCES_CHOICES = (
('appear-in', 'AppearIn'),
('talky', 'Talky'),
)
class Membership(models.Model): class Membership(models.Model):
# This model stores all project memberships. Also # This model stores all project memberships. Also
# stores invitations to memberships that does not have # stores invitations to memberships that does not have
@ -142,7 +136,7 @@ class Project(ProjectDefaults, models.Model):
is_issues_activated = models.BooleanField(default=True, null=False, blank=True, is_issues_activated = models.BooleanField(default=True, null=False, blank=True,
verbose_name=_("active issues panel")) verbose_name=_("active issues panel"))
videoconferences = models.CharField(max_length=250, null=True, blank=True, videoconferences = models.CharField(max_length=250, null=True, blank=True,
choices=VIDEOCONFERENCES_CHOICES, choices=choices.VIDEOCONFERENCES_CHOICES,
verbose_name=_("videoconference system")) verbose_name=_("videoconference system"))
videoconferences_salt = models.CharField(max_length=250, null=True, blank=True, videoconferences_salt = models.CharField(max_length=250, null=True, blank=True,
verbose_name=_("videoconference room salt")) verbose_name=_("videoconference room salt"))