cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Just pass the user object, rather than the display_name, to the user_path helper

Browse source
This commit is contained in:
Andy Allan 2018-09-10 10:54:29 +08:00
parent 5a2d2f97ce
commit 4dd4831c0a
9 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/changeset_helper.rb
View file

@ -3,7 +3,7 @@ module ChangesetHelper
if changeset.user.status == "deleted"
t("user.no_such_user.deleted")
elsif changeset.user.data_public?
link_to(changeset.user.display_name, user_path(changeset.user.display_name))
link_to(changeset.user.display_name, user_path(changeset.user))
else
t("browse.anonymous")
end

4
app/views/issues/_comments.html.erb
View file

@ -2,9 +2,9 @@
<% comments.each do |comment| %>
<div class="comment">
<div style="float:left">
<%= link_to user_thumbnail(comment.user), user_path(comment.user.display_name) %>
<%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
<b> <%= link_to comment.user.display_name, user_path(comment.user.display_name) %> </b> <br/>
<b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br/>
<%= comment.body %>
</div>
<span class="deemphasize">

4
app/views/issues/_reports.html.erb
View file

@ -1,9 +1,9 @@
<% reports.each do |report| %>
<div class="report">
<div style="float:left">
<%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>
<%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
<%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
<%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user)) %>
<br/>
<span class="deemphasize">
<%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>

4
app/views/issues/index.html.erb
View file

@ -34,10 +34,10 @@
<td><%= t ".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, user_path(issue.reported_user.display_name) if issue.reported_user %></td>
<td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
<td>
<% if issue.user_updated %>
<%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated.display_name)),
<%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
:time => distance_of_time_in_words_to_now(issue.updated_at),
:title => l(issue.updated_at) %>
<% else %>

2
app/views/layouts/_header.html.erb
View file

@ -86,7 +86,7 @@
<% end %>
</li>
<li>
<%= link_to t('user.show.my profile'), user_path(:display_name => current_user.display_name) %>
<%= link_to t('user.show.my profile'), user_path(current_user) %>
</li>
<li>
<%= link_to t('user.show.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>