From 6205846b804f2c6c29d8675a89f2a2713aa822b7 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 10 Mar 2020 11:40:24 +0100
Subject: [PATCH] Clean up code, change some minor things

---
 server/books/schema/queries.py | 10 ++++++++--
 server/portfolio/admin.py      |  8 ++++++++
 server/rooms/models.py         | 10 +++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 server/portfolio/admin.py

diff --git a/server/books/schema/queries.py b/server/books/schema/queries.py
index ff0d849b..6f981669 100644
--- a/server/books/schema/queries.py
+++ b/server/books/schema/queries.py
@@ -231,7 +231,13 @@ class BookNode(DjangoObjectType):
         return Topic.get_by_parent(self)
 
 
+class TopicConnection(relay.Connection):
+    class Meta:
+        node = TopicNode
+
+
 class BookQuery(object):
+    node = relay.Node.Field()
     book = relay.Node.Field(BookNode)
     topic = graphene.Field(TopicNode, slug=graphene.String())
     module = graphene.Field(ModuleNode, slug=graphene.String(), id=graphene.ID())
@@ -239,7 +245,7 @@ class BookQuery(object):
     content_block = relay.Node.Field(ContentBlockNode)
 
     books = DjangoFilterConnectionField(BookNode)
-    topics = DjangoFilterConnectionField(TopicNode)
+    topics = relay.ConnectionField(TopicConnection)
     modules = DjangoFilterConnectionField(ModuleNode)
     chapters = DjangoFilterConnectionField(ChapterNode)
 
@@ -247,7 +253,7 @@ class BookQuery(object):
         return Book.objects.filter(**kwargs).live()
 
     def resolve_topics(self, *args, **kwargs):
-        return Topic.objects.filter(**kwargs).live()
+        return Topic.objects.live()
 
     def resolve_modules(self, *args, **kwargs):
         return Module.objects.filter(**kwargs).live()
diff --git a/server/portfolio/admin.py b/server/portfolio/admin.py
new file mode 100644
index 00000000..6055357a
--- /dev/null
+++ b/server/portfolio/admin.py
@@ -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')
diff --git a/server/rooms/models.py b/server/rooms/models.py
index 097638db..a882cbc5 100644
--- a/server/rooms/models.py
+++ b/server/rooms/models.py
@@ -18,7 +18,7 @@ class Room(TitleSlugDescriptionModel):
     user_created = models.BooleanField(blank=False, null=False, default=True)
 
     def __str__(self):
-        return 'Room {}-{}-{}'.format(self.id, self.title, self.school_class)
+        return f'{self.title} - {self.school_class}'
 
 
 class RoomEntry(TitleSlugDescriptionModel):
@@ -38,13 +38,17 @@ class RoomEntry(TitleSlugDescriptionModel):
     ], null=True, blank=True)
 
     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):
         return user.is_superuser or self.room.school_class.is_user_in_schoolclass(user)
 
 
 class ModuleRoomSlug(TitleSlugDescriptionModel):
+    class Meta:
+        verbose_name = 'Slug für Modul-Raum'
+        verbose_name_plural = 'Slugs für Modul-Raum'
 
     def __str__(self):
-        return 'ModuleRoomSlug {}-{}'.format(self.id, self.title)
+        return f'ModuleRoomSlug {self.id}-{self.title}'
+