consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implements Proposals moderation controller

Browse Source
This commit is contained in:
kikito
2015-09-13 22:08:30 +02:00
parent 468c5c2a72
commit 9d253b0477
8 changed files with 307 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/controllers/moderation/proposals_controller.rb
View File

@@ -1,6 +1,44 @@
class Moderation::ProposalsController < Moderation::BaseController
has_filters %w{pending_flag_review all with_ignored_flag}, only: :index
has_orders %w{created_at flags}, only: :index
before_filter :load_proposals, only: [:index, :moderate]
load_and_authorize_resource
def index
@proposals = @proposals.send(@current_filter)
.send("sort_by_#{@current_order}")
.page(params[:page])
.per(50)
end
def hide
@proposal.hide
end
def moderate
@proposals = @proposals.where(id: params[:proposal_ids])
if params[:hide_proposals].present?
@proposals.accessible_by(current_ability, :hide).each(&:hide)
elsif params[:ignore_flags].present?
@proposals.accessible_by(current_ability, :ignore_flag).each(&:ignore_flag)
elsif params[:block_authors].present?
author_ids = @proposals.pluck(:author_id).uniq
User.where(id: author_ids).accessible_by(current_ability, :block).each(&:block)
end
redirect_to request.query_parameters.merge(action: :index)
end
private
def load_proposals
@proposals = Proposal.accessible_by(current_ability, :moderate)
end
end

77
app/views/moderation/proposals/index.html.erb Normal file
View File

@@ -0,0 +1,77 @@
<h2><%= t("moderation.proposals.index.title") %></h2>
<%= render 'shared/filter_subnav', i18n_namespace: "moderation.proposals.index" %>
<div class="row">
<h3 class="small-8 large-8 columns"><%= page_entries_info @proposals %></h3>
<div class="small-4 large-4 columns">
<div class="right">
<%= t("moderation.proposals.index.order") %>
<%= render 'shared/order_selector', i18n_namespace: "moderation.proposals.index" %>
</div>
</div>
</div>
<%= form_tag moderate_moderation_proposals_path(request.query_parameters), method: :put do %>
<p class="right js-check">
<%= t('shared.check') %>:
<%= link_to t('shared.check_all'), '#', data: {check_all: "proposal_ids[]"} %>
|
<%= link_to t('shared.check_none'), '#', data: {check_none: "proposal_ids[]"} %>
</p>
<table>
<tr>
<th>
<%= t("moderation.proposals.index.headers.proposal") %>
</th>
<th>
<%= t("moderation.proposals.index.headers.moderate") %>
</th>
</tr>
<% @proposals.each do |proposal| %>
<tr id="proposal_<%= proposal.id %>">
<td>
<%= link_to proposal.title, proposal, target: "_blank" %>
<br>
<span class="date"><%= l proposal.updated_at.to_date %></span>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= proposal.flags_count %><i class="icon-flag flag-disable"></i>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= proposal.author.username %>
<br>
<div style="height: 4rem; overflow: hidden;">
<%= proposal.description %>
</div>
</td>
<td class="text-center">
<%= check_box_tag "proposal_ids[]", proposal.id, nil, id: "#{dom_id(proposal)}_check" %>
</td>
</tr>
<% end %>
</table>
<%= submit_tag t('moderation.proposals.index.block_authors'),
name: "block_authors",
class: "button radius alert",
data: {confirm: t('moderation.proposals.index.confirm')}
%>
<div class="right">
<%= submit_tag t('moderation.proposals.index.hide_proposals'),
name: "hide_proposals",
class: "button radius alert",
data: {confirm: t('moderation.proposals.index.confirm')}
%>
<%= submit_tag t('moderation.proposals.index.ignore_flags'),
name: "ignore_flags",
class: "button radius success",
data: {confirm: t('moderation.proposals.index.confirm')}
%>
</div>
<%= paginate @proposals %>
<% end %>

3
config/locales/en.yml
View File

@@ -281,6 +281,9 @@ en:
flag: Flag as inappropriate
unflag: Undo flag
collective: Collective
check: Select
check_all: All
check_none: None
mailer:
comment:
subject: Someone has commented on your debate

3
config/locales/es.yml
View File

@@ -283,6 +283,9 @@ es:
flag: Denunciar como inapropiado
unflag: Deshacer denuncia
collective: Colectivo
check: Seleccionar
check_all: Todos
check_none: Ninguno
mailer:
comment:
subject: Alguien ha comentado en tu propuesta

22
config/locales/moderation.en.yml
View File

@@ -42,6 +42,28 @@ en:
all: All
pending_flag_review: Pending
with_ignored_flag: Ignored
proposals:
index:
hide_proposals: Hide proposals
block_authors: Block authors
ignore_flags: Ignore flags
title: Proposals
headers:
proposal: Proposal
moderate: Moderate
hide: Hide
ignore_flag: Ignore
ignored_flag: Ignored
filter: Filter
filters:
all: All
pending_flag_review: Pending
with_ignored_flag: Ignored
order: Order
orders:
created_at: Newest
flags: Most flagged
confirm: Are you sure?
bulk:
index:
title: Bulk moderation

22
config/locales/moderation.es.yml
View File

@@ -42,6 +42,28 @@ es:
all: Todos
pending_flag_review: Pendientes
with_ignored_flag: Ignorados
proposals:
index:
hide_proposals: Ocultar Propuestas
block_authors: Bloquear autores
ignore_flags: Marcar como revisadas
title: Propuestas
headers:
proposal: Propuesta
moderate: Moderar
hide: Hide
ignore_flag: Ignore
ignored_flag: Ignored
filter: Filtro
filters:
all: Todas
pending_flag_review: Pendientes de revisión
with_ignored_flag: Marcadas como revisadas
order: Ordenar por
orders:
created_at: Más recientes
flags: Más denunciadas
confirm: ¿Estás seguro?
bulk:
index:
title: Moderar en bloque

5
config/routes.rb
View File

@@ -134,8 +134,9 @@ Rails.application.routes.draw do
resources :proposals, only: :index do
member do
put :hide
put :hide_in_moderation_screen
put :ignore_flag
end
collection do
put :moderate
end
end

139
spec/features/moderation/proposals_spec.rb
View File

@@ -35,4 +35,143 @@ feature 'Moderate proposals' do
expect(page).to_not have_link('Block author')
end
end
feature '/moderation/ screen' do
background do
moderator = create(:moderator)
login_as(moderator.user)
end
feature 'moderate in bulk' do
feature "When a proposal has been selected for moderation" do
background do
@proposal = create(:proposal)
visit moderation_proposals_path
within("#proposal_#{@proposal.id}") do
check "proposal_#{@proposal.id}_check"
end
expect(page).to_not have_css("proposal_#{@proposal.id}")
end
scenario 'Hide the proposal' do
click_on "Hide proposals"
expect(page).to_not have_css("proposal_#{@proposal.id}")
expect(@proposal.reload).to be_hidden
expect(@proposal.author).to_not be_hidden
end
scenario 'Block the author' do
click_on "Block authors"
expect(page).to_not have_css("proposal_#{@proposal.id}")
expect(@proposal.reload).to be_hidden
expect(@proposal.author).to be_hidden
end
scenario 'Ignore the proposal' do
click_on "Ignore flags"
expect(page).to_not have_css("proposal_#{@proposal.id}")
expect(@proposal.reload).to be_ignored_flag
expect(@proposal.reload).to_not be_hidden
expect(@proposal.author).to_not be_hidden
end
end
scenario "select all/none", :js do
create_list(:proposal, 20)
visit moderation_proposals_path
within('.js-check') { click_on 'All' }
all('input[type=checkbox]').each do |checkbox|
expect(checkbox).to be_checked
end
within('.js-check') { click_on 'None' }
all('input[type=checkbox]').each do |checkbox|
expect(checkbox).to_not be_checked
end
end
scenario "remembering page, filter and order" do
create_list(:proposal, 55)
visit moderation_proposals_path(filter: 'all', page: '2', order: 'created_at')
click_on "Ignore flags"
expect(page).to have_selector('.js-order-selector[data-order="created_at"]')
expect(current_url).to include('filter=all')
expect(current_url).to include('page=2')
expect(current_url).to include('order=created_at')
end
end
scenario "Current filter is properly highlighted" do
visit moderation_proposals_path
expect(page).to_not have_link('Pending')
expect(page).to have_link('All')
expect(page).to have_link('Ignored')
visit moderation_proposals_path(filter: 'all')
within('.sub-nav') do
expect(page).to_not have_link('All')
expect(page).to have_link('Pending')
expect(page).to have_link('Ignored')
end
visit moderation_proposals_path(filter: 'pending_flag_review')
within('.sub-nav') do
expect(page).to have_link('All')
expect(page).to_not have_link('Pending')
expect(page).to have_link('Ignored')
end
visit moderation_proposals_path(filter: 'with_ignored_flag')
within('.sub-nav') do
expect(page).to have_link('All')
expect(page).to have_link('Pending')
expect(page).to_not have_link('Ignored')
end
end
scenario "Filtering proposals" do
create(:proposal, title: "Pending proposal")
create(:proposal, :hidden, title: "Hidden proposal")
create(:proposal, :with_ignored_flag, title: "Ignored proposal")
visit moderation_proposals_path(filter: 'all')
expect(page).to have_content('Pending proposal')
expect(page).to_not have_content('Hidden proposal')
expect(page).to have_content('Ignored proposal')
visit moderation_proposals_path(filter: 'pending_flag_review')
expect(page).to have_content('Pending proposal')
expect(page).to_not have_content('Hidden proposal')
expect(page).to_not have_content('Ignored proposal')
visit moderation_proposals_path(filter: 'with_ignored_flag')
expect(page).to_not have_content('Pending proposal')
expect(page).to_not have_content('Hidden proposal')
expect(page).to have_content('Ignored proposal')
end
scenario "sorting proposals" do
create(:proposal, title: "Flagged proposal", created_at: Time.now - 1.day, flags_count: 5)
create(:proposal, title: "Newer proposal", created_at: Time.now)
visit moderation_proposals_path(order: 'created_at')
expect("Newer proposal").to appear_before("Flagged proposal")
visit moderation_proposals_path(order: 'flags')
expect("Flagged proposal").to appear_before("Newer proposal")
end
end
end