Don't try and display IP address for users without one

This commit is contained in:
Tom Hughes 2010-05-07 09:29:38 +01:00
parent b9deb68de1
commit 7211872790
2 changed files with 13 additions and 5 deletions

View file

@ -6,11 +6,18 @@
</td>
<td>
<p>
<%= 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)
%>
<% if user.creation_ip %>
<%= 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 %>
<%= 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 %>
</p>
<%= htmlize(user.description) %>
</td>

View file

@ -1651,6 +1651,7 @@ en:
one: Showing page {{page}} ({{first_item}} of {{items}})
other: Showing page {{page}} ({{first_item}}-{{last_item}} of {{items}})
summary: "{{name}} created from {{ip_address}} on {{date}}"
summary_no_ip: "{{name}} created on {{date}}"
confirm: Confirm Selected Users
hide: Hide Selected Users
empty: No matching users found