Use named paths for various user blocks links

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index b309e9e119bd661b023b05fc2a5d537739b91dd7..f39efb571ecc477b044fe5e7f829f99ca793b2e7 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -17,6 +17,6 @@
   <td><%= link_to t(".show"), block %></td>
   <td><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
   <% if show_revoke_link %>
-  <td><% if block.active? %><%= link_to t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => block.id %><% end %></td>
+  <td><% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %></td>
   <% end %>
 </tr>

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 64f7299eff306aa122325e7929827fb0092ae1d9..d686bda105014dfb726c17994a18f32c9cdcdd6e 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -14,7 +14,7 @@
       <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
     <% end %>
     <% if can?(:revoke, UserBlock) %>
-      <li><%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %></li>
+      <li><%= link_to t(".revoke"), revoke_user_block_path(@user_block) %></li>
     <% end %>
   <% end %>
   <li><%= link_to t(".back"), user_blocks_path %></li>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 61a775c516bc987ec23df18afec09c47fcf8a2f4..5e7883799c088a39067aa54bccb8a458efd01fd7 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -30,14 +30,14 @@
 
           <% if current_user.blocks.exists? %>
             <li>
-              <%= link_to t(".blocks on me"), :controller => "user_blocks", :action => "blocks_on", :display_name => current_user.display_name %>
+              <%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% 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 %>
+              <%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
             </li>
           <% end %>
@@ -84,21 +84,21 @@
 
           <% if @user.blocks.exists? %>
             <li>
-              <%= link_to t(".block_history"), :controller => "user_blocks", :action => "blocks_on", :display_name => @user.display_name %>
+              <%= link_to t(".block_history"), user_blocks_on_path(@user) %>
               <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if @user.moderator? and @user.blocks_created.exists? %>
             <li>
-              <%= link_to t(".moderator_history"), :controller => "user_blocks", :action => "blocks_by", :display_name => @user.display_name %>
+              <%= link_to t(".moderator_history"), user_blocks_by_path(@user) %>
               <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
             </li>
           <% end %>
 
           <% if can?(:create, UserBlock) %>
             <li>
-            <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
+            <%= link_to t(".create_block"), new_user_block_path(@user) %>
             </li>
           <% end %>