From dfb0ceb67b4a1f488f085a456757a78c5616c379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sun, 12 Apr 2015 15:20:38 +0200 Subject: [PATCH] compat django1.8: update models --- .../migrations/0004_auto_20150412_1319.py | 53 +++++++++++++++++++ accounts/models.py | 6 +-- tracker/migrations/0004_auto_20150412_1319.py | 30 +++++++++++ tracker/models.py | 6 +-- 4 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 accounts/migrations/0004_auto_20150412_1319.py create mode 100644 tracker/migrations/0004_auto_20150412_1319.py diff --git a/accounts/migrations/0004_auto_20150412_1319.py b/accounts/migrations/0004_auto_20150412_1319.py new file mode 100644 index 0000000..df0f625 --- /dev/null +++ b/accounts/migrations/0004_auto_20150412_1319.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +from django.conf import settings +import django.contrib.auth.models +import django.core.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0003_user_notifications'), + ] + + operations = [ + migrations.AlterModelManagers( + name='user', + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.AlterField( + model_name='team', + name='groups', + field=models.ManyToManyField(related_name='teams', to='accounts.Group', blank=True), + ), + migrations.AlterField( + model_name='team', + name='users', + field=models.ManyToManyField(related_name='+', to=settings.AUTH_USER_MODEL, blank=True), + ), + migrations.AlterField( + model_name='user', + name='email', + field=models.EmailField(max_length=254, verbose_name='email address', blank=True), + ), + migrations.AlterField( + model_name='user', + name='groups', + field=models.ManyToManyField(verbose_name='groups', related_name='user_set', to='auth.Group', help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_query_name='user', blank=True), + ), + migrations.AlterField( + model_name='user', + name='last_login', + field=models.DateTimeField(null=True, verbose_name='last login', blank=True), + ), + migrations.AlterField( + model_name='user', + name='username', + field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], verbose_name='username', unique=True), + ), + ] diff --git a/accounts/models.py b/accounts/models.py index b586026..461d8eb 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -75,10 +75,8 @@ class Team(models.Model): # We dont want related field on User object because we use # a special function that retrieve also team through group - users = models.ManyToManyField(User, blank=True, null=True, - related_name='+') - groups = models.ManyToManyField(Group, blank=True, null=True, - related_name='teams') + users = models.ManyToManyField(User, blank=True, related_name='+') + groups = models.ManyToManyField(Group, blank=True, related_name='teams') def __str__(self): return self.name diff --git a/tracker/migrations/0004_auto_20150412_1319.py b/tracker/migrations/0004_auto_20150412_1319.py new file mode 100644 index 0000000..5c8a29d --- /dev/null +++ b/tracker/migrations/0004_auto_20150412_1319.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + ('tracker', '0003_auto_20140905_0229'), + ] + + operations = [ + migrations.AlterField( + model_name='issue', + name='labels', + field=models.ManyToManyField(related_name='issues', to='tracker.Label', blank=True), + ), + migrations.AlterField( + model_name='issue', + name='subscribers', + field=models.ManyToManyField(related_name='subscribed_issues', to=settings.AUTH_USER_MODEL, blank=True), + ), + migrations.AlterField( + model_name='project', + name='subscribers', + field=models.ManyToManyField(related_name='subscribed_projects', to=settings.AUTH_USER_MODEL, blank=True), + ), + ] diff --git a/tracker/models.py b/tracker/models.py index 8b9d2aa..e7ea5da 100644 --- a/tracker/models.py +++ b/tracker/models.py @@ -43,7 +43,7 @@ class Project(models.Model): access = models.IntegerField(choices=ACCESS_TYPE, default=ACCESS_PUBLIC) - subscribers = models.ManyToManyField(User, blank=True, null=True, + subscribers = models.ManyToManyField(User, blank=True, related_name='subscribed_projects') def __str__(self): @@ -138,7 +138,7 @@ class Issue(models.Model): closed = models.BooleanField(default=False) - labels = models.ManyToManyField(Label, blank=True, null=True, + labels = models.ManyToManyField(Label, blank=True, related_name='issues') milestone = models.ForeignKey(Milestone, blank=True, null=True, @@ -146,7 +146,7 @@ class Issue(models.Model): assignee = models.ForeignKey(User, blank=True, null=True, related_name='+') - subscribers = models.ManyToManyField(User, blank=True, null=True, + subscribers = models.ManyToManyField(User, blank=True, related_name='subscribed_issues') @staticmethod