Fix type error on view

webkom · Feb 26, 2024 · fd5913a · fd5913a
1 parent 8a24356
commit fd5913a
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 117 deletions.
diff --git a/lego/apps/forums/migrations/0001_initial.py b/lego/apps/forums/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.10 on 2024-01-23 19:04
+# Generated by Django 4.0.10 on 2024-02-26 16:56
 
 import django.db.models.deletion
 import django.utils.timezone
@@ -104,4 +104,98 @@ class Migration(migrations.Migration):
                 "abstract": False,
             },
         ),
+        migrations.CreateModel(
+            name="Thread",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created_at",
+                    models.DateTimeField(
+                        db_index=True, default=django.utils.timezone.now, editable=False
+                    ),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, editable=False
+                    ),
+                ),
+                (
+                    "deleted",
+                    models.BooleanField(db_index=True, default=False, editable=False),
+                ),
+                ("require_auth", models.BooleanField(default=True)),
+                ("slug", models.SlugField(null=True, unique=True)),
+                ("title", models.CharField(max_length=255)),
+                ("description", models.TextField()),
+                ("text", lego.apps.content.fields.ContentField(allow_images=False)),
+                ("pinned", models.BooleanField(default=False)),
+                (
+                    "can_edit_groups",
+                    models.ManyToManyField(
+                        blank=True,
+                        related_name="can_edit_%(class)s",
+                        to="users.abakusgroup",
+                    ),
+                ),
+                (
+                    "can_edit_users",
+                    models.ManyToManyField(
+                        blank=True,
+                        related_name="can_edit_%(class)s",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "can_view_groups",
+                    models.ManyToManyField(
+                        blank=True,
+                        related_name="can_view_%(class)s",
+                        to="users.abakusgroup",
+                    ),
+                ),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        default=None,
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_created",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "forum",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="threads",
+                        to="forums.forum",
+                    ),
+                ),
+                ("tags", models.ManyToManyField(blank=True, to="tags.tag")),
+                (
+                    "updated_by",
+                    models.ForeignKey(
+                        default=None,
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_updated",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
     ]
diff --git a/lego/apps/forums/migrations/0002_thread.py b/lego/apps/forums/migrations/0002_thread.py
diff --git a/lego/apps/forums/permissions.py b/lego/apps/forums/permissions.py
@@ -41,7 +41,7 @@ def has_perm(
         return False
 
     def has_object_permissions(self, user, perm, obj):
-        return perm != DELETE and perm != EDIT
+        return not (perm == DELETE or perm == EDIT)
 
 
 class ThreadPermissionHandler(PermissionHandler):
@@ -85,8 +85,10 @@ def has_perm(
         return False
 
     def has_object_permissions(self, user, perm, obj):
+        if perm == DELETE:
+            return False
         if perm == EDIT and obj.created_by == user:
             return True
         if perm == CREATE:
             return True
-        return perm != DELETE and perm != EDIT
+        return not (perm == DELETE or perm == EDIT)
diff --git a/lego/apps/forums/views.py b/lego/apps/forums/views.py
@@ -26,6 +26,7 @@ def get_serializer_class(self):
             return PublicForumSerializer
         if self.request and self.request.user.is_authenticated:
             return DetailedAdminForumSerializer
+        return super().get_serializer_class()
 
     def get_object(self) -> Forum:
         queryset = self.get_queryset()

diff --git a/lego/apps/tags/tests/test_views.py b/lego/apps/tags/tests/test_views.py
@@ -31,6 +31,8 @@ def test_fetch_detail(self):
                     "quote": 0,
                     "joblisting": 0,
                     "poll": 0,
+                    "forum": 0,
+                    "thread": 0,
                 },
             },
         )