X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ae8c0b3baff821423ef4830abab075ffb8f4ead9..e54f9ed6af7ab3475948ab47b45ccdcc283cd49b:/app/views/user/_user.html.erb diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb index 66f6cd3bc..4f2f59c92 100644 --- a/app/views/user/_user.html.erb +++ b/app/views/user/_user.html.erb @@ -6,13 +6,20 @@

- <%= t 'user.list.summary', - :name => h(user.display_name), - :ip_address => link_to(user.creation_ip, :ip => user.creation_ip), - :date => l(user.creation_time, :format => :friendly) - %> + <% if user.creation_ip %> + <%= raw t 'user.list.summary', + :name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name), + :ip_address => link_to(user.creation_ip, :ip => user.creation_ip), + :date => l(user.creation_time, :format => :friendly) + %> + <% else %> + <%= raw t 'user.list.summary_no_ip', + :name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name), + :date => l(user.creation_time, :format => :friendly) + %> + <% end %>

- <%= htmlize(user.description) %> + <%= user.description.to_html %> <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>