Merge pull request #5151 from AntonKhorev/no-history-and-export-buttons

[rails.git] / app / views / users / _user.html.erb

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 399ef8dcd89843d0c7603152b6b8ec99a5b95947..2fb14b6bdf7056f2196e4c476905f49480e0d758 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -4,18 +4,18 @@
   </td>
   <td>
     <p>
   </td>
   <td>
     <p>

-      <% if user.creation_ip %>
+      <% if user.creation_address %>

         <%= t "users.index.summary_html",
         <%= t "users.index.summary_html",

-              :name => link_to(user.display_name, user_path(user)),
-              :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
-              :date => l(user.creation_time, :format => :friendly) %>
+              :name => link_to(user.display_name, user),
+              :ip_address => link_to(user.creation_address, :ip => user.creation_address),
+              :date => l(user.created_at, :format => :friendly) %>

       <% else %>
         <%= t "users.index.summary_no_ip_html",
       <% else %>
         <%= t "users.index.summary_no_ip_html",

-              :name => link_to(user.display_name, user_path(user)),
-              :date => l(user.creation_time, :format => :friendly) %>
+              :name => link_to(user.display_name, user),
+              :date => l(user.created_at, :format => :friendly) %>

       <% end %>
     </p>
       <% end %>
     </p>

-    <div class="richtext"><%= user.description.to_html %></div>
+    <div class="richtext text-break"><%= user.description.to_html %></div>

   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>
   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>