Implements admin interface for Comments incl. filters

app/controllers/admin/comments_controller.rb

@@ -1,13 +1,35 @@
 class Admin::CommentsController < Admin::BaseController
+  before_filter :set_valid_filters, only: :index
+  before_filter :parse_filter, only: :index
+
+  before_filter :load_comment, only: [:confirm_hide, :restore]
 
   def index
-    @comments = Comment.only_hidden.page(params[:page])
+    @comments = Comment.only_hidden.send(@filter).page(params[:page])
+  end
+
+  def confirm_hide
+    @comment.confirm_hide
+    redirect_to request.query_parameters.merge(action: :index)
   end
 
   def restore
-    @comment = Comment.with_hidden.find(params[:id])
     @comment.restore
-    redirect_to admin_comments_path, notice: t('admin.comments.restore.success')
+    redirect_to request.query_parameters.merge(action: :index)
   end
 
-end
+  private
+    def load_comment
+      @comment = Comment.with_hidden.find(params[:id])
+    end
+
+    def set_valid_filters
+      @valid_filters = %w{all with_confirmed_hide}
+    end
+
+    def parse_filter
+      @filter = params[:filter]
+      @filter = 'all' unless @valid_filters.include?(@filter)
+    end
+
+end

app/models/comment.rb

@@ -1,7 +1,7 @@
 class Comment < ActiveRecord::Base
-  include ActsAsParanoidAliases
   acts_as_nested_set scope: [:commentable_id, :commentable_type], counter_cache: :children_count
   acts_as_paranoid column: :hidden_at
+  include ActsAsParanoidAliases
   acts_as_votable
 
   attr_accessor :as_moderator, :as_administrator

app/views/admin/comments/index.html.erb

@@ -1,13 +1,17 @@
 <h2><%= t("admin.comments.index.title") %></h2>
 
-<!-- Filters for pending and archived comments (example on "/admin/organizations/index.html.erb")-->
 <dl class="sub-nav">
   <dt><%= t("admin.comments.index.filter") %>:</dt>
-  <dd class="active"><%= t("admin.comments.filters.all") %></dd>
-  <dd><%= t("admin.comments.filters.pending") %></dd>
-  <dd><%= t("admin.comments.filters.archived") %></dd>
+
+  <% @valid_filters.each do |filter| %>
+    <% if @filter == filter %>
+      <dd class="active"><%= t("admin.comments.index.filters.#{filter}") %></dd>
+    <% else %>
+      <dd><%= link_to t("admin.comments.index.filters.#{filter}"),
+        admin_comments_path(filter: filter) %></dd>
+    <% end %>
+  <% end %>
 </dl>
-<!-- Filters for pending and archived comments (example on "/admin/organizations/index.html.erb")-->
 
 <h3><%= page_entries_info @comments %></h3>
 
@@ -17,17 +21,19 @@
       <div class="row">
         <div class="small-12 medium-8 column">
           <%= comment.body %>
-          <!-- Link to debate of this comment -->
-          <%= link_to t("admin.comments.index.show_debate"), "#" %>
-          <!-- /. Link to debate of this comment -->
+          <%= link_to comment.commentable.title, comment.commentable %>
         </div>
         <div class="small-6 medium-4 column text-right">
-          <!-- Link to archive this comment -->
-          <%= link_to t("admin.actions.archive"), "#", class: "button radius tiny warning" %>
-          <!-- /. Link to archive this comment -->
-          <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment),
-                      method: :put, data: { confirm: t("admin.actions.confirm") },
-                      class: "button radius tiny success" %>
+          <%= link_to t("admin.actions.restore"),
+                restore_admin_comment_path(comment, request.query_parameters),
+                method: :put,
+                data: { confirm: t("admin.actions.confirm") },
+                class: "button radius tiny success right" %>
+
+          <%= link_to t("admin.actions.confirm_hide"),
+                confirm_hide_admin_comment_path(comment, request.query_parameters),
+                method: :put,
+                class: "button radius tiny warning right" %>
         </div>
       </div>
     </li>