Convert various moderator? tests to use cancancan permissions checks

diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb
index a87cca604fd9c220a66fb07d22d24786e3c0fb99..1eb20f16f1564ce0350d51bb5f3d802a0822d72e 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -12,9 +12,13 @@
   <%= @redaction.description.to_html %>
 </div>
 
   <%= @redaction.description.to_html %>
 </div>
 

-<% if current_user and current_user.moderator? %>
+<% if can?(:edit, Redaction) || can?(:destroy, Redaction) %>

 <div class="buttons">
 <div class="buttons">

-  <%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %></td>
-  <%= button_to t(".destroy"), @redaction, :method => "delete", :remote => true, :data => { :confirm => t(".confirm") } %>
+  <% if can?(:edit, Redaction) %>
+    <%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %></td>
+  <% end %>
+  <% if can?(:destroy, Redaction) %>
+    <%= button_to t(".destroy"), @redaction, :method => "delete", :remote => true, :data => { :confirm => t(".confirm") } %>
+  <% end %>

 </div>
 <% end %>
 </div>
 <% end %>

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 15d3c970f68cba751b7f6d7d8a68ffb9b04ac9a0..284052a7b5413e7a8d344de18b86f02191b60420 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
 <% end %>
 
 <% unless @user_blocks.empty? %>

-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => false } %>

 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 004a967b0fbf6dbe2cf47a8fdcf86212a24e8a52..bb71d48c8c1d5f555e2734501611b9eb2c554fb4 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -3,7 +3,7 @@
   <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
 <% end %>
 <% unless @user_blocks.empty? %>
   <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
 <% end %>
 <% unless @user_blocks.empty? %>

-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => false, :show_creator_name => true } %>

 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 42e75ecf0a5597685a62508820baa2c6ea7cee6d..57cef6055992722523a71dc475feb718b6c1423a 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -4,7 +4,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
 <% end %>
 
 <% unless @user_blocks.empty? %>

-<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user && current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => true } %>

 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 7b34d204a96c3edbb5a0ab2b55944be7d647aaa6..7e225bf14e34b2cec45d43c221469a55d2d55af2 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -13,7 +13,7 @@
     <% if current_user and current_user.id == @user_block.creator_id %>
       <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
     <% end %>
     <% if current_user and current_user.id == @user_block.creator_id %>
       <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
     <% end %>

-    <% if current_user and current_user.moderator? %>
+    <% if can?(:revoke, UserBlock) %>

       <li><%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %></li>
     <% end %>
   <% end %>
       <li><%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %></li>
     <% end %>
   <% end %>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 51dcb4f92f5c0da7089392d0da2f0f7e97374828..7e8b451851bf48302f3df1a56c19c53cd1ff3ae7 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -35,7 +35,7 @@
             </li>
           <% end %>
 
             </li>
           <% end %>
 

-          <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>
+          <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>

             <li>
               <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
             <li>
               <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>


@@ -96,7 +96,7 @@
             </li>
           <% end %>
 
             </li>
           <% end %>
 

-          <% if current_user and current_user.moderator? %>
+          <% if can?(:create, UserBlock) %>

             <li>
             <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
             </li>
             <li>
             <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
             </li>