Rename UserSchoolClassConnection to SchoolClassMember
This commit is contained in:
parent
35c981a2f2
commit
0ea72fe598
|
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
from django.db import migrations
|
from django.db import migrations
|
||||||
|
|
||||||
from users.models import UserSchoolClassConnection
|
|
||||||
|
|
||||||
|
|
||||||
def forwards(apps, schema_editor):
|
def forwards(apps, schema_editor):
|
||||||
SchoolClass = apps.get_model('users', 'SchoolClass')
|
SchoolClass = apps.get_model('users', 'SchoolClass')
|
||||||
UserSchoolClassConnection = apps.get_model('users', 'UserSchoolClassConnection')
|
UserSchoolClassConnection = apps.get_model('users', 'UserSchoolClassConnection')
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
# Generated by Django 2.1.15 on 2020-03-04 12:50
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('users', '0015_auto_20200303_1306'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RenameModel(
|
||||||
|
old_name='UserSchoolClassConnection',
|
||||||
|
new_name='SchoolClassMember',
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -70,7 +70,8 @@ class User(AbstractUser):
|
||||||
class SchoolClass(models.Model):
|
class SchoolClass(models.Model):
|
||||||
name = models.CharField(max_length=100, blank=False, null=False, unique=True)
|
name = models.CharField(max_length=100, blank=False, null=False, unique=True)
|
||||||
is_deleted = models.BooleanField(blank=False, null=False, default=False)
|
is_deleted = models.BooleanField(blank=False, null=False, default=False)
|
||||||
users = models.ManyToManyField(get_user_model(), related_name='school_classes', blank=True, through='users.UserSchoolClassConnection')
|
users = models.ManyToManyField(get_user_model(), related_name='school_classes', blank=True,
|
||||||
|
through='users.SchoolClassMember')
|
||||||
code = models.CharField('Code zum Beitreten', blank=True, null=True, max_length=10, unique=True, default=None)
|
code = models.CharField('Code zum Beitreten', blank=True, null=True, max_length=10, unique=True, default=None)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
@ -178,7 +179,7 @@ class UserSetting(models.Model):
|
||||||
selected_class = models.ForeignKey(SchoolClass, blank=True, null=True, on_delete=models.CASCADE)
|
selected_class = models.ForeignKey(SchoolClass, blank=True, null=True, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
|
||||||
class UserSchoolClassConnection(models.Model):
|
class SchoolClassMember(models.Model):
|
||||||
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||||
school_class = models.ForeignKey(SchoolClass, on_delete=models.CASCADE)
|
school_class = models.ForeignKey(SchoolClass, on_delete=models.CASCADE)
|
||||||
active = models.BooleanField(default=True)
|
active = models.BooleanField(default=True)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue