ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Refactor school class naming

This commit is contained in:
Ramon Wenger 2018-10-08 10:52:55 +02:00
parent 85cc99470e
commit d970f75fa4
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/FilterBar.vue
View File

@ -48,7 +48,7 @@
return this.$store.state.filterForSchoolClass; return this.$store.state.filterForSchoolClass;
}, },
schoolClasses() { schoolClasses() {
return this.$getRidOfEdges(this.me.schoolclassSet); return this.$getRidOfEdges(this.me.schoolClasses);
}, },
showEverythingRadioButton() { showEverythingRadioButton() {
return this.me.permissions.includes('user.can_edit_modules'); return this.me.permissions.includes('user.can_edit_modules');

2
client/src/components/VisibilityPopover.vue
View File

@ -63,7 +63,7 @@
computed: { computed: {
schoolClasses() { schoolClasses() {
return this.$getRidOfEdges(this.me.schoolclassSet); return this.$getRidOfEdges(this.me.schoolClasses);
}, },
schoolClassVisibility() { schoolClassVisibility() {

2
client/src/components/rooms/RoomForm.vue
View File

@ -60,7 +60,7 @@
computed: { computed: {
schoolClasses() { schoolClasses() {
return this.$getRidOfEdges(this.me.schoolclassSet); return this.$getRidOfEdges(this.me.schoolClasses);
} }
}, },

2
client/src/graphql/gql/fragments/userParts.gql
View File

@ -7,7 +7,7 @@ fragment UserParts on UserNode {
firstName firstName
lastName lastName
avatar avatar
schoolclassSet { schoolClasses {
edges { edges {
node { node {
...SchoolClassParts ...SchoolClassParts

4
server/user/models.py
View File

@ -47,7 +47,7 @@ class SchoolClass(models.Model):
name = models.CharField(max_length=100, blank=False, null=False) name = models.CharField(max_length=100, blank=False, null=False)
year = models.PositiveIntegerField(blank=False, null=False, validators=[MinValueValidator(1900), MaxValueValidator(2200)]) year = models.PositiveIntegerField(blank=False, null=False, validators=[MinValueValidator(1900), MaxValueValidator(2200)])
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()) users = models.ManyToManyField(get_user_model(), related_name='school_classes')
school = models.ForeignKey('School', null=False, on_delete=models.CASCADE) school = models.ForeignKey('School', null=False, on_delete=models.CASCADE)
def __str__(self): def __str__(self):
@ -130,7 +130,7 @@ class SchoolRoleManager(models.Manager):
class SchoolRole(models.Model): class SchoolRole(models.Model):
key = models.CharField(_('Key'), max_length=100, blank=False, null=False) 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) school = models.ForeignKey('School', blank=False, null=False, on_delete=models.CASCADE)
role_permission = models.ManyToManyField(Permission, verbose_name=_('Role permission'), role_permission = models.ManyToManyField(Permission, verbose_name=_('Role permission'),
blank=True, related_name="role_set", related_query_name="role") blank=True, related_name="role_set", related_query_name="role")

2
server/user/schema.py
View File

@ -14,7 +14,7 @@ class UserNode(DjangoObjectType):
class Meta: class Meta:
model = User model = User
filter_fields = ['username', 'email'] 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,) interfaces = (relay.Node,)
def resolve_pk(self, info, **kwargs): def resolve_pk(self, info, **kwargs):