From 0ea72fe598d23be682f54f82cf6d253c48ca4eb5 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 4 Mar 2020 16:32:10 +0100 Subject: [PATCH] Rename UserSchoolClassConnection to SchoolClassMember --- .../users/migrations/0013_auto_20200303_1259.py | 3 --- .../users/migrations/0016_auto_20200304_1250.py | 17 +++++++++++++++++ server/users/models.py | 5 +++-- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 server/users/migrations/0016_auto_20200304_1250.py diff --git a/server/users/migrations/0013_auto_20200303_1259.py b/server/users/migrations/0013_auto_20200303_1259.py index 6b82bc12..8136a893 100644 --- a/server/users/migrations/0013_auto_20200303_1259.py +++ b/server/users/migrations/0013_auto_20200303_1259.py @@ -2,9 +2,6 @@ from django.db import migrations -from users.models import UserSchoolClassConnection - - def forwards(apps, schema_editor): SchoolClass = apps.get_model('users', 'SchoolClass') UserSchoolClassConnection = apps.get_model('users', 'UserSchoolClassConnection') diff --git a/server/users/migrations/0016_auto_20200304_1250.py b/server/users/migrations/0016_auto_20200304_1250.py new file mode 100644 index 00000000..7f29426f --- /dev/null +++ b/server/users/migrations/0016_auto_20200304_1250.py @@ -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', + ), + ] diff --git a/server/users/models.py b/server/users/models.py index 30932ea1..51049015 100644 --- a/server/users/models.py +++ b/server/users/models.py @@ -70,7 +70,8 @@ class User(AbstractUser): class SchoolClass(models.Model): name = models.CharField(max_length=100, blank=False, null=False, unique=True) 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) class Meta: @@ -178,7 +179,7 @@ class UserSetting(models.Model): 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) school_class = models.ForeignKey(SchoolClass, on_delete=models.CASCADE) active = models.BooleanField(default=True)