compat django1.8: update models

This commit is contained in:
Élie Bouttier 2015-04-12 15:20:38 +02:00
parent d64c9ed567
commit dfb0ceb67b
4 changed files with 88 additions and 7 deletions

View file

@ -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),
),
]

View file

@ -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

View file

@ -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),
),
]

View file

@ -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