Merge branch 'master' into notes

[rails.git] / app / views / notes / mine.html.erb

diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb
index 50c15cd9d3f1678cc150b8e1702fcb032d2bc631..e385e942baad0c42473d0824defa8e0850a47450 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -23,11 +23,11 @@
     </td>
     <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
     <% if note.author.nil? %> 
-      <td> <%= note.author_name %> </td> 
+      <td></td> 
     <% else %> 
-      <td><%= link_to h(note.author_name), :controller => "user", :action => "view", :display_name => note.author_name %></td>
+      <td><%= link_to h(note.author.display_name), user_url(:display_name => note.author.display_name) %></td>
     <% end %>
-    <td> <%= htmlize note.comments.first.body  %> </td>        
+    <td> <%= note.comments.first.body.to_html  %> </td>        
     <td><%= l note.created_at %></td>
     <td><%= l note.updated_at %></td>
   </tr>