From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Mar 2018 06:21:43 +0000 (+0800)
Subject: User user_path to generate links to users
X-Git-Tag: live~2953^2~32
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9e46754c887e9dc2caa412942dc7e964aa48cfcf?ds=inline

User user_path to generate links to users
---

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index ec885aa8c..e42371465 100644
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -2,9 +2,9 @@
   <% comments.each do |comment| %>
     <div class="comment">
       <div style="float:left">
-        <%= link_to user_thumbnail(comment.user), :controller => :user, :action =>:view, :display_name => comment.user.display_name %>
+        <%= link_to user_thumbnail(comment.user), user_path(comment.user.display_name) %>
       </div>
-      <b> <%= link_to comment.user.display_name, :controller => :user, :action =>:view, :display_name => comment.user.display_name %> </b> <br/>
+      <b> <%= link_to comment.user.display_name, user_path(comment.user.display_name) %> </b> <br/>
       <%= comment.body %>
     </div>
     <span class="deemphasize">
diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 01c34efe1..51643a6af 100644
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,9 +1,10 @@
 <% reports.each do |report| %>
   <div class="reports">
     <div style="float:left">
-      <%= link_to user_thumbnail(report.user), :controller => :user, :action =>:view, :display_name => report.user.display_name %>
+      <%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>
     </div>
-    <%= t(".reported_by_html", :category => report.category, :user_name => report.user.display_name, :user_url => url_for(:controller => :user, :action => :view, :display_name => report.user.display_name)) %> <br/>
+    <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
+    <br/>
     <span class="deemphasize">
       <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
     </span>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 53927701e..30b283324 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -34,10 +34,10 @@
         <td><%= t "issues.states.#{issue.status}" %></td>
         <td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
         <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
-        <td><%= link_to issue.reported_user.display_name, :controller => :user, :action => :view, :display_name => issue.reported_user.display_name if issue.reported_user %></td>
+        <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user.display_name) if issue.reported_user %></td>
         <td>
           <% if issue.user_updated %>
-            <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, :controller => :user, :action => :view, :display_name => issue.user_updated.display_name),
+            <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated.display_name)),
                                                   :time => distance_of_time_in_words_to_now(issue.updated_at),
                                                   :title => l(issue.updated_at) %>
           <% else %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65c490e8d..2466561b4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1028,7 +1028,7 @@ en:
       created_at: "On %{datetime}"
     reports:
       updated_at: "On %{datetime}"
-      reported_by_html: "Reported as %{category} by <a href=\"%{user_url}\">%{user_name}</a>"
+      reported_by_html: "Reported as %{category} by %{user}"
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'