Use user_path links. Fixes #1785

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 5ef68216bf81e8cc26a53845bf138110edbc1a10..37d4da00e009cdeeabdfa1a763264ca158329561 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -11,7 +11,7 @@ class UserRolesController < ApplicationController
 
   def grant
     @this_user.roles.create(:role => @role, :granter => current_user)
-    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+    redirect_to user_path(@this_user)
   end
 
   def revoke
@@ -21,7 +21,7 @@ class UserRolesController < ApplicationController
     else
       UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
     end
-    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+    redirect_to user_path(@this_user)
   end
 
   private
@@ -32,7 +32,7 @@ class UserRolesController < ApplicationController
   def require_administrator
     unless current_user.administrator?
       flash[:error] = t "user_role.filter.not_an_administrator"
-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)
     end
   end
 
@@ -43,7 +43,7 @@ class UserRolesController < ApplicationController
     @role = params[:role]
     unless UserRole::ALL_ROLES.include?(@role)
       flash[:error] = t("user_role.filter.not_a_role", :role => @role)
-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)
     end
   end
 
@@ -52,7 +52,7 @@ class UserRolesController < ApplicationController
   def not_in_role
     if @this_user.has_role? @role
       flash[:error] = t("user_role.filter.already_has_role", :role => @role)
-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)
     end
   end
 
@@ -61,7 +61,7 @@ class UserRolesController < ApplicationController
   def in_role
     unless @this_user.has_role? @role
       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)
     end
   end
 end

diff --git a/app/models/user.rb b/app/models/user.rb
index 9c99c36a6d7a4bb52391bd1c26772dfe58907d3e..908a3d013a5538c698735ce79d3676b185f1fcf4 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -113,6 +113,10 @@ class User < ActiveRecord::Base
   before_save :update_tile
   after_save :spam_check
 
+  def to_param
+    display_name
+  end
+
   def self.authenticate(options)
     if options[:username] && options[:password]
       user = find_by("email = ? OR display_name = ?", options[:username], options[:username])

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 6a3e856802c2b4c3d4c7bde5090d96e0a17a585b..81e1614c10570f5b691108c1d6957ec1fae61f62 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -35,8 +35,7 @@
                 <small class='deemphasize'>
                   <%= t("browse.changeset.commented_by",
                     :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
-                    :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view",
-                    :display_name => comment.author.display_name})).html_safe %>
+                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
                   <% if current_user and current_user.moderator? %>
                     — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t('javascripts.changesets.show.hide_comment') %></span>
                   <% end %>
@@ -48,8 +47,7 @@
                 <small class='deemphasize'>
                   <%= t("browse.changeset.hidden_commented_by",
                     :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
-                    :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view",
-                    :display_name => comment.author.display_name})).html_safe %>
+                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
                   — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t('javascripts.changesets.show.unhide_comment') %></span>
                  </small>
                 <%= comment.body.to_html %>

diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb
index c651c294304e3e6805009ad3a38b69ab5f468839..43f8cbbc1b8ecd0e836ff95660724bbebdd2d140 100644 (file)
--- a/app/views/diary_entry/_diary_comment.html.erb
+++ b/app/views/diary_entry/_diary_comment.html.erb
@@ -1,6 +1,6 @@
 <div class="clearfix diary-comment">
   <%= user_thumbnail diary_comment.user %>
-  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %></p>
+  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %></p>
   <div class="richtext"><%= diary_comment.body.to_html %></div>
   <%= if_administrator(:span) do %>
     <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %>

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 410e13047663bb32439a90da611a646906216a5c..763915e46cb15937a62e8e737b9a0ec722824430 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -7,7 +7,7 @@
     <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
 
     <small class='deemphasize'>
-      <%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
+      <%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
     </small>
 
   </div>

diff --git a/app/views/message/_message_summary.html.erb b/app/views/message/_message_summary.html.erb
index 6e692ab2c85acac0622c9b449e6443adb319b0bc..5e1f17ef4a01be6e0a736cdfb4883c350b392621 100644 (file)
--- a/app/views/message/_message_summary.html.erb
+++ b/app/views/message/_message_summary.html.erb
@@ -1,5 +1,5 @@
 <tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if not message_summary.message_read? %>">
-  <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %></td>
+  <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
   <td class="inbox-subject"><%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id  %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-mark-unread"><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %></td>

diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/message/_sent_message_summary.html.erb
index de21e8cd3cde2321febfa46a929b55f3f81f92ce..6b4637708edb773cb5c973d44cdaed8f86482d1f 100644 (file)
--- a/app/views/message/_sent_message_summary.html.erb
+++ b/app/views/message/_sent_message_summary.html.erb
@@ -1,5 +1,5 @@
 <tr class="inbox-row">
-  <td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %></td>
+  <td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
   <td class="inbox-subject"><%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id  %></td>
   <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-delete"><%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %></td>

diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb
index 919a3e4023c132a3476b661fe89a9e1d423cf5d5..f9fc31149d5aaeccfd231740063362130e27445d 100644 (file)
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -20,5 +20,5 @@
     </tbody>
   </table>
 <% else %>
-  <div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => current_user.display_name)) %></div>
+  <div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), user_path(current_user))) %></div>
 <% end %>

diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index b2534e47b367c71dd0db8dedef604237e908a187..0b54adb1caecb87944ab19c5d940a86e8bbcff88 100644 (file)
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@message.recipient.display_name), {:controller => 'user', :action => 'view', :display_name => @message.recipient.display_name})) %></h2>
+  <h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
 <% end %>
 
 <%= error_messages_for 'message' %>

diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb
index 288c235ebd3c5718d588595e8e6b0717c70eca6d..a3a0dbbdfad925071686e5922038f6ed56339e4f 100644 (file)
--- a/app/views/message/outbox.html.erb
+++ b/app/views/message/outbox.html.erb
@@ -19,5 +19,5 @@
     </tbody>
   </table>
 <% else %>
-  <div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => current_user.display_name)) %></div>
+  <div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), user_path(current_user))) %></div>
 <% end %>

diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index 6621c3e8ed760481bc87a39749c6ff7c48ca477e..c23eabe95acf59d99f7028c617f6e75b563b39aa 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -5,7 +5,7 @@
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>
-    <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
@@ -24,7 +24,7 @@
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>
-    <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>

diff --git a/app/views/notes/_user.html.erb b/app/views/notes/_user.html.erb
index 0e950765044f213282cdaa1a3fa27a6de939454f..21bab618cdd7b2e79ff21b2358585d62165b68ac 100644 (file)
--- a/app/views/notes/_user.html.erb
+++ b/app/views/notes/_user.html.erb
@@ -1 +1 @@
-<%= link_to user.display_name, :controller => "user", :action => "view", :display_name => user.display_name %>
+<%= link_to user.display_name, user_path(user) %>

diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb
index b9786992ce8542f70577455a999c14512312ce6b..99f7cd1f1a42d834434f3ab37cfa72b8607d65ed 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -5,7 +5,7 @@
 
 <p>
   <b><%= t 'redaction.show.user' %></b>
-  <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>
+  <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>
 <p class="richtext">
   <b><%= t 'redaction.show.description' %></b>

diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 0fecd8f9910625e9fceefcf648d2e0d5871b5728..ecadacc64942fbe099b55c657950144c3d6b4e2e 100644 (file)
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -21,7 +21,7 @@
       <br />
       <%= trace.description %>
     <br />
-    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>
     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index 935862af4766ca30e9da188b227d97f56b528950..07e9820e6ada5894679561fab8a25a7c041cd3e8 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -32,7 +32,7 @@
   <% end %>
     <div class='form-row'>
       <label class='standard-label'><%= t'trace.edit.owner' %></label>
-      <p class='deemphasize'><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></p>
+      <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t'trace.edit.description' %></label>

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 351c69227921a2c038768b5fd3085d55d376ab3b..ef951372fedcba824fa78dd37a4c0f1f87e01e17 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -30,7 +30,7 @@
   <% end %>
   <tr>
     <td><%= t'trace.view.owner' %></td>
-    <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
+    <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>
   </tr>
   <tr>
     <td><%= t'trace.view.description' %></td>

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
index 08b982cd76c097f117d9fb891ce2e1f9e475196f..bb1dff0dceaec32429f228a9b3459b8ea4b2a9b4 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -10,7 +10,7 @@
   <%= user_thumbnail contact %>
   <div class='activity-details'>
     <p class='deemphasize'>
-      <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
+      <%= link_to h(contact.display_name), user_path(contact) %>
       <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>
         <% distance = @this_user.distance(contact) %>
         <% if distance < 1 %>

diff --git a/app/views/user/_popup.html.erb b/app/views/user/_popup.html.erb
index 8a63fbb25e4f66be57846530a33403d4b3c15f6c..80446b7a9369270c8639393136da5e2d94adc439 100644 (file)
--- a/app/views/user/_popup.html.erb
+++ b/app/views/user/_popup.html.erb
@@ -1,5 +1,5 @@
 <div class="user_popup">
   <%= user_thumbnail popup %>
   <p><%= t('user.popup.' + type) %></p>
-  <p><%= link_to popup.display_name, :controller => "user", :action => "view", :display_name => popup.display_name %></p>
+  <p><%= link_to popup.display_name, user_path(popup) %></p>
 </div>

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 169e5662aaedd4448b9c905072ea040fd14fca11..a493ade681a408fe3cae2aed5c9a74464c23e364 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -5,7 +5,7 @@
 <% content_for :heading do %>
   <h1><%= t 'user.account.my settings' %></h1>
   <ul class='secondary-actions clearfix'>
-    <li><%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => current_user.display_name %></li>
+    <li><%= link_to t('user.account.return to profile'), user_path(current_user) %></li>
     <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
   </ul>
 <% end %>

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index 501ae92d0ca1a80defd631320be9e59c868bd24a..d91168f54109c63565e6d4b01d5e8de684124828 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -2,10 +2,10 @@
   <% c1 = cycle('table0', 'table1') %>
 
   <% if show_user_name %>
-  <td class="<%= c1 %>"><%= link_to h(block.user.display_name), :controller => 'user', :action => 'view', :display_name => block.user.display_name %></td>
+  <td class="<%= c1 %>"><%= link_to h(block.user.display_name), user_path(block.user) %></td>
   <% end %>
   <% if show_creator_name %>
-  <td class="<%= c1 %>"><%= link_to h(block.creator.display_name), :controller => 'user', :action => 'view', :display_name => block.creator.display_name %></td>
+  <td class="<%= c1 %>"><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>
   <% end %>
   <td class="<%= c1 %>"><%=h truncate(block.reason) %></td>
   <td class="<%= c1 %>"><%=h block_status(block) %></td>
@@ -13,7 +13,7 @@
     <% if block.revoker_id.nil? %>
       <%= t('user_block.partial.not_revoked') %>
     <% else %>
-      <%= link_to h(block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => block.revoker.display_name %>
+      <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
     <% end %>
   </td>
   <td class="<%= c1 %>"><%= link_to t('user_block.partial.show'), block %></td>

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index d2f888e7d185f8a30ef13c06316dad0c1b8b8a73..02f6f17cede52f2220148895a419c5e4f20b0d16 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,6 +1,6 @@
 <% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
 <% content_for :heading do %>
-  <h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
+  <h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), user_path(@this_user)))) %></h1>
 <% end %>
 
 <% unless @user_blocks.empty? %>

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 3973355317d03f04d24481c7ad58d000d6358344..18419986a886c895eb533a73fabc20cba124fdc7 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,6 +1,6 @@
 <% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %>
 <% content_for :heading do %>
-  <h1><%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
+  <h1><%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), user_path(@this_user)))) %></h1>
 <% end %>
 <% unless @user_blocks.empty? %>
 <%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 0eee8a6f642a1ee60781bfafbb11da9010ae9039..289f7a8316d1543ba5744360d353944175f39a73 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,9 +1,8 @@
 <% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
 <% content_for :heading do %>
   <h1><%= raw t('user_block.edit.title',
-                :name => link_to(
-                                 h(@user_block.user.display_name),
-                                 {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
+                :name => link_to(h(@user_block.user.display_name),
+                                 user_path(@user_block.user))) %></h1>
   <ul class='secondary-actions clearfix'>
     <li><%= link_to t('user_block.edit.show'), @user_block %></li>
     <li><%= link_to t('user_block.edit.back'), user_blocks_path %></li>

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 9ea63f885cb4c49ef3b818c7d29db782a994e8af..4161f6af8301221d514bbd1c9accd49fe0a2f50d 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -3,7 +3,7 @@
   <h1><%= raw t('user_block.new.heading',
                 :name => link_to(
                                  h(@this_user.display_name),
-                                 {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
+                                 user_path(@this_user))) %></h1>
 <% end %>
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index c67f7cde26900b02da41cc694ec9c13ed366be69..f812ffff6cce318c15a18ddc1bac98fbea13bbb4 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -6,10 +6,10 @@
   <h1><%= raw t('user_block.revoke.heading',
                 :block_on => link_to(
                                      h(@user_block.user.display_name),
-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+                                     user_path(@user_block.user)),
                 :block_by => link_to(
                                      h(@user_block.creator.display_name),
-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+                                     user_path(@user_block.creator))) %></h1>
 <% end %>
 
 <% if @user_block.ends_at > Time.now %>

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index cc0caa6f3f2d44590c0e39d5e83e4a517d00b60c..51fbcaf49e2ba1f3e9e12e10c49dd13d96ea5ff8 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -6,10 +6,10 @@
   <h1><%= raw t('user_block.show.heading',
                 :block_on => link_to(
                                      h(@user_block.user.display_name),
-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+                                     user_path(@user_block.user)),
                 :block_by => link_to(
                                      h(@user_block.creator.display_name),
-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+                                     user_path(@user_block.creator))) %></h1>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
     <% if current_user and current_user.id == @user_block.creator_id %>
@@ -26,7 +26,7 @@
 <% if @user_block.revoker %>
 <p>
   <b><%= t'user_block.show.revoker' %></b>
-  <%= link_to h(@user_block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => @user_block.revoker.display_name %>
+  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
 </p>
 <% end %>