adds pending filter to admin/comments
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
class Admin::CommentsController < Admin::BaseController
|
||||
has_filters %w{all with_confirmed_hide}
|
||||
has_filters %w{without_confirmed_hide all with_confirmed_hide}
|
||||
|
||||
before_action :load_comment, only: [:confirm_hide, :restore]
|
||||
|
||||
def index
|
||||
@comments = Comment.only_hidden.send(@current_filter).page(params[:page])
|
||||
@comments = Comment.only_hidden.send(@current_filter).order(hidden_at: :desc).page(params[:page])
|
||||
end
|
||||
|
||||
def confirm_hide
|
||||
|
||||
@@ -18,11 +18,12 @@
|
||||
method: :put,
|
||||
data: { confirm: t("admin.actions.confirm") },
|
||||
class: "button radius tiny success right" %>
|
||||
|
||||
<% unless comment.confirmed_hide? %>
|
||||
<%= link_to t("admin.actions.confirm_hide"),
|
||||
confirm_hide_admin_comment_path(comment, request.query_parameters),
|
||||
method: :put,
|
||||
class: "button radius tiny warning right" %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
@@ -59,6 +59,7 @@ en:
|
||||
filters:
|
||||
all: All
|
||||
with_confirmed_hide: Confirmed
|
||||
without_confirmed_hide: Pending
|
||||
debates:
|
||||
index:
|
||||
title: Hidden debates
|
||||
|
||||
@@ -59,6 +59,7 @@ es:
|
||||
filters:
|
||||
all: Todos
|
||||
with_confirmed_hide: Confirmados
|
||||
without_confirmed_hide: Pendientes
|
||||
debates:
|
||||
index:
|
||||
title: Debates ocultos
|
||||
|
||||
@@ -24,22 +24,31 @@ feature 'Admin comments' do
|
||||
|
||||
click_link 'Confirm'
|
||||
|
||||
expect(page).to_not have_content(comment.body)
|
||||
click_link('Confirmed')
|
||||
expect(page).to have_content(comment.body)
|
||||
expect(page).to have_content('Confirmed')
|
||||
|
||||
expect(comment.reload).to be_confirmed_hide
|
||||
end
|
||||
|
||||
scenario "Current filter is properly highlighted" do
|
||||
visit admin_comments_path
|
||||
expect(page).to_not have_link('All')
|
||||
expect(page).to_not have_link('Pending')
|
||||
expect(page).to have_link('All')
|
||||
expect(page).to have_link('Confirmed')
|
||||
|
||||
visit admin_comments_path(filter: 'Pending')
|
||||
expect(page).to_not have_link('Pending')
|
||||
expect(page).to have_link('All')
|
||||
expect(page).to have_link('Confirmed')
|
||||
|
||||
visit admin_comments_path(filter: 'all')
|
||||
expect(page).to have_link('Pending')
|
||||
expect(page).to_not have_link('All')
|
||||
expect(page).to have_link('Confirmed')
|
||||
|
||||
visit admin_comments_path(filter: 'with_confirmed_hide')
|
||||
expect(page).to have_link('Pending')
|
||||
expect(page).to have_link('All')
|
||||
expect(page).to_not have_link('Confirmed')
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user