From 3dbde420d8d68b2966c0fb2f529a9209d6dd56fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 29 Jul 2016 10:02:57 +0200 Subject: [PATCH] Add missed migrations --- .../migrations/0051_auto_20160729_0802.py | 19 +++++++++++++++++++ taiga/projects/models.py | 16 ++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 taiga/projects/migrations/0051_auto_20160729_0802.py diff --git a/taiga/projects/migrations/0051_auto_20160729_0802.py b/taiga/projects/migrations/0051_auto_20160729_0802.py new file mode 100644 index 00000000..24767fdb --- /dev/null +++ b/taiga/projects/migrations/0051_auto_20160729_0802.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-07-29 08:02 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0050_project_epics_csv_uuid'), + ] + + operations = [ + migrations.AlterModelOptions( + name='project', + options={'ordering': ['name', 'id'], 'verbose_name': 'project', 'verbose_name_plural': 'projects'}, + ), + ] diff --git a/taiga/projects/models.py b/taiga/projects/models.py index 080cd411..1642426c 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -87,6 +87,12 @@ class Membership(models.Model): user_order = models.IntegerField(default=10000, null=False, blank=False, verbose_name=_("user order")) + class Meta: + verbose_name = "membership" + verbose_name_plural = "memberships" + unique_together = ("user", "project",) + ordering = ["project", "user__full_name", "user__username", "user__email", "email"] + def get_related_people(self): related_people = get_user_model().objects.filter(id=self.user.id) return related_people @@ -97,12 +103,6 @@ class Membership(models.Model): if self.user and memberships.count() > 0 and memberships[0].id != self.id: raise ValidationError(_('The user is already member of the project')) - class Meta: - verbose_name = "membership" - verbose_name_plural = "memberships" - unique_together = ("user", "project",) - ordering = ["project", "user__full_name", "user__username", "user__email", "email"] - class ProjectDefaults(models.Model): default_epic_status = models.OneToOneField("projects.EpicStatus", @@ -258,10 +258,6 @@ class Project(ProjectDefaults, TaggedMixin, TagsColorsdMixin, models.Model): ["name", "id"], ] - permissions = ( - ("view_project", "Can view project"), - ) - def __str__(self): return self.name