fix: moderator can delete the forum thread & post (#29)

* fix: moderator can delete the forum thread & post
CircuitVerse · Jul 30, 2024 · 3bd69f1 · 3bd69f1
1 parent 3abb960
commit 3bd69f1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/app/controllers/simple_discussion/application_controller.rb b/app/controllers/simple_discussion/application_controller.rb
@@ -13,7 +13,7 @@ def is_moderator_or_owner?(object)
   helper_method :is_moderator_or_owner?
 
   def is_moderator?
-    current_user.respond_to?(:moderator) && current_user.moderator?
+    current_user.respond_to?(:moderator?) && current_user.moderator?
   end
   helper_method :is_moderator?
 

diff --git a/app/controllers/simple_discussion/forum_threads_controller.rb b/app/controllers/simple_discussion/forum_threads_controller.rb
@@ -1,7 +1,7 @@
 class SimpleDiscussion::ForumThreadsController < SimpleDiscussion::ApplicationController
   before_action :authenticate_user!, only: [:mine, :participating, :new, :create]
-  before_action :set_forum_thread, only: [:show, :edit, :update]
-  before_action :require_mod_or_author_for_thread!, only: [:edit, :update]
+  before_action :set_forum_thread, only: [:show, :edit, :update, :destroy]
+  before_action :require_mod_or_author_for_thread!, only: [:edit, :update, :destroy]
 
   def index
     @forum_threads = ForumThread.pinned_first.sorted.includes(:user, :forum_category).paginate(page: page_number)
@@ -60,6 +60,11 @@ def update
     end
   end
 
+  def destroy
+    @forum_thread.destroy!
+    redirect_to simple_discussion.forum_threads_path
+  end
+
   private
 
   def set_forum_thread

diff --git a/app/models/forum_thread.rb b/app/models/forum_thread.rb
@@ -5,7 +5,7 @@ class ForumThread < ApplicationRecord
 
   belongs_to :forum_category
   belongs_to :user
-  has_many :forum_posts
+  has_many :forum_posts, dependent: :destroy
   has_many :forum_subscriptions
   has_many :optin_subscribers, -> { where(forum_subscriptions: {subscription_type: :optin}) }, through: :forum_subscriptions, source: :user
   has_many :optout_subscribers, -> { where(forum_subscriptions: {subscription_type: :optout}) }, through: :forum_subscriptions, source: :user

diff --git a/app/views/simple_discussion/forum_posts/_forum_post.html.erb b/app/views/simple_discussion/forum_posts/_forum_post.html.erb
@@ -2,7 +2,6 @@
 
 <%= content_tag :div, id: dom_id(forum_post), class: "forum-post" do %>
   <div class="forum-post-header">
-
     <% if is_moderator_or_owner?(forum_post) %>
       <div class="float-right">
         <%= link_to icon("fas","edit"), simple_discussion.edit_forum_thread_forum_post_path(@forum_thread, forum_post),

diff --git a/app/views/simple_discussion/forum_threads/show.html.erb b/app/views/simple_discussion/forum_threads/show.html.erb
@@ -1,6 +1,16 @@
 <div class="row">
   <div class="col-md-12 block-inline mb-2">
     <h2 style="display:inline"><%= icon "fas", "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h2>
+    <div class="float-right d-flex">
+      <% if is_moderator_or_owner?(@forum_thread) %>
+        <%= link_to icon("fas","trash"), simple_discussion.forum_thread_path(@forum_thread),
+          class: "text-muted",
+          method: :delete, 
+          data: { toggle: "tooltip", placement: "left", confirm: "Are you sure you want to delete this thread?" },
+          title: t('delete_this_thread')
+        %>
+      <% end %>
+    </div>
   </div>
 </div>