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

Clean up code, change some minor things

This commit is contained in:
Ramon Wenger 2020-03-10 11:40:24 +01:00
parent 3e2b1f66a9
commit 6205846b80
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/books/schema/queries.py
View File

@ -231,7 +231,13 @@ class BookNode(DjangoObjectType):
return Topic.get_by_parent(self) return Topic.get_by_parent(self)
class TopicConnection(relay.Connection):
class Meta:
node = TopicNode
class BookQuery(object): class BookQuery(object):
node = relay.Node.Field()
book = relay.Node.Field(BookNode) book = relay.Node.Field(BookNode)
topic = graphene.Field(TopicNode, slug=graphene.String()) topic = graphene.Field(TopicNode, slug=graphene.String())
module = graphene.Field(ModuleNode, slug=graphene.String(), id=graphene.ID()) module = graphene.Field(ModuleNode, slug=graphene.String(), id=graphene.ID())
@ -239,7 +245,7 @@ class BookQuery(object):
content_block = relay.Node.Field(ContentBlockNode) content_block = relay.Node.Field(ContentBlockNode)
books = DjangoFilterConnectionField(BookNode) books = DjangoFilterConnectionField(BookNode)
topics = DjangoFilterConnectionField(TopicNode) topics = relay.ConnectionField(TopicConnection)
modules = DjangoFilterConnectionField(ModuleNode) modules = DjangoFilterConnectionField(ModuleNode)
chapters = DjangoFilterConnectionField(ChapterNode) chapters = DjangoFilterConnectionField(ChapterNode)
@ -247,7 +253,7 @@ class BookQuery(object):
return Book.objects.filter(**kwargs).live() return Book.objects.filter(**kwargs).live()
def resolve_topics(self, *args, **kwargs): def resolve_topics(self, *args, **kwargs):
return Topic.objects.filter(**kwargs).live() return Topic.objects.live()
def resolve_modules(self, *args, **kwargs): def resolve_modules(self, *args, **kwargs):
return Module.objects.filter(**kwargs).live() return Module.objects.filter(**kwargs).live()

8
server/portfolio/admin.py Normal file
View File

@ -0,0 +1,8 @@
from django.contrib import admin
from portfolio.models import Project
@admin.register(Project)
class ProjectAdmin(admin.ModelAdmin):
list_display = ('title', 'slug')

10
server/rooms/models.py
View File

@ -18,7 +18,7 @@ class Room(TitleSlugDescriptionModel):
user_created = models.BooleanField(blank=False, null=False, default=True) user_created = models.BooleanField(blank=False, null=False, default=True)
def __str__(self): def __str__(self):
return 'Room {}-{}-{}'.format(self.id, self.title, self.school_class) return f'{self.title} - {self.school_class}'
class RoomEntry(TitleSlugDescriptionModel): class RoomEntry(TitleSlugDescriptionModel):
@ -38,13 +38,17 @@ class RoomEntry(TitleSlugDescriptionModel):
], null=True, blank=True) ], null=True, blank=True)
def __str__(self): def __str__(self):
return 'RoomEntry {}-{}-{}'.format(self.id, self.title, self.author) return f'RoomEntry {self.id}-{self.title}-{self.author}'
def can_user_see_entry(self, user): def can_user_see_entry(self, user):
return user.is_superuser or self.room.school_class.is_user_in_schoolclass(user) return user.is_superuser or self.room.school_class.is_user_in_schoolclass(user)
class ModuleRoomSlug(TitleSlugDescriptionModel): class ModuleRoomSlug(TitleSlugDescriptionModel):
class Meta:
verbose_name = 'Slug für Modul-Raum'
verbose_name_plural = 'Slugs für Modul-Raum'
def __str__(self): def __str__(self):
return 'ModuleRoomSlug {}-{}'.format(self.id, self.title) return f'ModuleRoomSlug {self.id}-{self.title}'