debats/debats
debats/debats
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Tiqa/Debats

Browse source
This commit is contained in:
Marwann 2016-02-07 02:31:25 +01:00
commit 69d6ea30f0
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/public_figures_controller.rb
View file

@ -44,7 +44,7 @@ class PublicFiguresController < ApplicationController
store_location store_location
flash[:danger] = "Vous devez être identifié pour supprimer une personnalité" flash[:danger] = "Vous devez être identifié pour supprimer une personnalité"
redirect_to login_url redirect_to login_url
elsif allowed_to? :delete_public_figure elsif allowed_to? :delete_personality
flash[:danger] = "Vous n'avez pas assez de réputation pour supprimer une personnalité" flash[:danger] = "Vous n'avez pas assez de réputation pour supprimer une personnalité"
redirect_to(PublicFigure.find(params[:id])) redirect_to(PublicFigure.find(params[:id]))
end end

4
app/views/public_figures/_statement.html.erb
View file

@ -1,6 +1,8 @@
<li> <li>
Au sujet de Au sujet de
<%= link_to statement.position.subject.title, statement.position.subject %> <%= link_to statement.position.subject.title, statement.position.subject %>
en faveur de <br><%= pluralize(subject.positions.count, 'positions') %>, <%= pluralize(subject.statements.count, 'prise de position') %>
<br><br>
<%= link_to statement.position.title, statement.position %> <%= link_to statement.position.title, statement.position %>
<br>TAGS ASSOCIES
</li> </li>

7
app/views/public_figures/show.html.erb
View file

@ -9,7 +9,7 @@
<% end %> <% end %>
<% if allowed_to? :delete_public_figure %> <% if allowed_to? :delete_minor_personality %>
<%= link_to "Supprimer", @public_figure, <%= link_to "Supprimer", @public_figure,
method: :delete, method: :delete,
data: { confirm: "Supprimer \"#{@public_figure.title}\" ?" }, data: { confirm: "Supprimer \"#{@public_figure.title}\" ?" },
@ -20,10 +20,7 @@
<section class="Statements"> <section class="Statements">
<h2><%=t "The_statements" %></h2> <h2><%=t "The_statements" %><%= t('statements_count', count: @public_figure.statements.count) %></h2>
<p><%= t('statements_count', count: @public_figure.statements.count) %></p>
<% if @public_figure.statements.any? %> <% if @public_figure.statements.any? %>
<ul class="Statements"> <ul class="Statements">

4
config/reputation.yml
View file

@ -35,8 +35,8 @@ defaults: &defaults
reject_position: confirmed_user reject_position: confirmed_user
## Moderators (10000) ## Moderators (10000)
delete_minor_subject: moderator # ==> Minor subject: less than 1 week old, or less than 5 arguments delete_minor_subject: moderator # ==> Minor subject: less than 1 week old, or less than 5 statements
delete_minor_personality: moderator # ==> Minor personality: less than 1 week old, or less than 2 arguments delete_minor_personality: moderator # ==> Minor personality: less than 1 week old, or less than 2 statements
delete_evidentce: moderator delete_evidentce: moderator
delete_argument: moderator delete_argument: moderator
delete_position: moderator delete_position: moderator