Organizers can now delete forum posts

src/apps/forums/views.py

@@ -84,9 +84,9 @@ class DeletePostView(ForumBaseMixin, LoginRequiredMixin, DeleteView):
     def delete(self, request, *args, **kwargs):
         self.object = self.get_object()
 
-        if self.object.thread.forum.competition.created_by == request.user or \
-                self.object.posted_by == request.user:
-
+        if self.object.posted_by == request.user or \
+            request.user in self.object.thread.forum.competition.collaborators.all() or \
+                self.object.thread.forum.competition.created_by == request.user:
             # If there are more posts in the thread, leave it around, otherwise delete it
             if self.object.thread.posts.count() == 1:
                 success_url = self.object.thread.forum.get_absolute_url()
@@ -146,9 +146,19 @@ class ThreadDetailView(ForumBaseMixin, DetailView):
     def get_context_data(self, **kwargs):
         thread = self.object
         context = super().get_context_data(**kwargs)
-        context['ordered_posts'] = thread.posts.all().order_by('date_created')\
+        ordered_posts = thread.posts.all().order_by('date_created')\
             .select_related('thread__forum__competition__created_by', 'posted_by')\
             .prefetch_related('thread__forum__competition__collaborators')
+
+        # Check if request.user has admin permissions
+        for post in ordered_posts:
+            post.user_is_admin = (
+                self.request.user == post.posted_by or
+                self.request.user == post.thread.forum.competition.created_by or
+                self.request.user in post.thread.forum.competition.collaborators.all()
+            )
+
+        context['ordered_posts'] = ordered_posts
         return context
 
 

src/templates/forums/thread_detail.html

@@ -21,7 +21,7 @@
                             <div class="posted-date">{{ post.date_created }}</div>
                         </div>
                         <div class="post-actions">
-                            {% if thread.forum.competition.creator == request.user or post.posted_by == request.user %}
+                            {% if post.user_is_admin %}
                             <i class="icon trash red remove-button" data-submission-pk="{{ post.pk }}"></i>
                             {% endif %}
                         </div>
@@ -62,7 +62,7 @@
         $(document).ready(function () {
             $('.remove-button').click(function (event) {
                 var submission_pk = event.target.dataset.submissionPk
-                if (confirm("Are you sure you want to delete this?")) {
+                if (confirm("Are you sure you want to delete this post?")) {
                     redirect_post("/forums/{{ thread.forum.pk }}/{{ thread.pk }}/delete/" + submission_pk + "/")
                 }
             })