From d970f75fa493a19d784eb2135d58cb83ced19dbd Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Mon, 8 Oct 2018 10:52:55 +0200
Subject: [PATCH] Refactor school class naming

---
 client/src/components/FilterBar.vue            | 2 +-
 client/src/components/VisibilityPopover.vue    | 2 +-
 client/src/components/rooms/RoomForm.vue       | 2 +-
 client/src/graphql/gql/fragments/userParts.gql | 2 +-
 server/user/models.py                          | 4 ++--
 server/user/schema.py                          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/components/FilterBar.vue b/client/src/components/FilterBar.vue
index 772261a3..fb00c764 100644
--- a/client/src/components/FilterBar.vue
+++ b/client/src/components/FilterBar.vue
@@ -48,7 +48,7 @@
         return this.$store.state.filterForSchoolClass;
       },
       schoolClasses() {
-        return this.$getRidOfEdges(this.me.schoolclassSet);
+        return this.$getRidOfEdges(this.me.schoolClasses);
       },
       showEverythingRadioButton() {
         return this.me.permissions.includes('user.can_edit_modules');
diff --git a/client/src/components/VisibilityPopover.vue b/client/src/components/VisibilityPopover.vue
index 54dbbb0b..8bfbeca5 100644
--- a/client/src/components/VisibilityPopover.vue
+++ b/client/src/components/VisibilityPopover.vue
@@ -63,7 +63,7 @@
 
     computed: {
       schoolClasses() {
-        return this.$getRidOfEdges(this.me.schoolclassSet);
+        return this.$getRidOfEdges(this.me.schoolClasses);
       },
 
       schoolClassVisibility() {
diff --git a/client/src/components/rooms/RoomForm.vue b/client/src/components/rooms/RoomForm.vue
index e87a5619..d0d698db 100644
--- a/client/src/components/rooms/RoomForm.vue
+++ b/client/src/components/rooms/RoomForm.vue
@@ -60,7 +60,7 @@
 
     computed: {
       schoolClasses() {
-        return this.$getRidOfEdges(this.me.schoolclassSet);
+        return this.$getRidOfEdges(this.me.schoolClasses);
       }
     },
 
diff --git a/client/src/graphql/gql/fragments/userParts.gql b/client/src/graphql/gql/fragments/userParts.gql
index 5fc1981d..077dcdfb 100644
--- a/client/src/graphql/gql/fragments/userParts.gql
+++ b/client/src/graphql/gql/fragments/userParts.gql
@@ -7,7 +7,7 @@ fragment UserParts on UserNode {
   firstName
   lastName
   avatar
-  schoolclassSet {
+  schoolClasses {
     edges {
       node {
         ...SchoolClassParts
diff --git a/server/user/models.py b/server/user/models.py
index 6e97f335..91a4f122 100644
--- a/server/user/models.py
+++ b/server/user/models.py
@@ -47,7 +47,7 @@ class SchoolClass(models.Model):
     name = models.CharField(max_length=100, blank=False, null=False)
     year = models.PositiveIntegerField(blank=False, null=False, validators=[MinValueValidator(1900), MaxValueValidator(2200)])
     is_deleted = models.BooleanField(blank=False, null=False, default=False)
-    users = models.ManyToManyField(get_user_model())
+    users = models.ManyToManyField(get_user_model(), related_name='school_classes')
     school = models.ForeignKey('School', null=False, on_delete=models.CASCADE)
 
     def __str__(self):
@@ -130,7 +130,7 @@ class SchoolRoleManager(models.Manager):
 class SchoolRole(models.Model):
 
     key = models.CharField(_('Key'), max_length=100, blank=False, null=False)
-    name = models.CharField(_(u'Name'), max_length=100, blank=False, null=False)
+    name = models.CharField(_('Name'), max_length=100, blank=False, null=False)
     school = models.ForeignKey('School', blank=False, null=False, on_delete=models.CASCADE)
     role_permission = models.ManyToManyField(Permission, verbose_name=_('Role permission'),
                                              blank=True, related_name="role_set", related_query_name="role")
diff --git a/server/user/schema.py b/server/user/schema.py
index 7777c7ca..132136e6 100644
--- a/server/user/schema.py
+++ b/server/user/schema.py
@@ -14,7 +14,7 @@ class UserNode(DjangoObjectType):
     class Meta:
         model = User
         filter_fields = ['username', 'email']
-        only_fields = ['username', 'email', 'first_name', 'last_name', 'schoolclass_set', ]
+        only_fields = ['username', 'email', 'first_name', 'last_name', 'school_classes', ]
         interfaces = (relay.Node,)
 
     def resolve_pk(self, info, **kwargs):