X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52395b3cdf4d3cfae95730158edeeccf3d062a8e..bb2c0c76ae8b85621c71d2d26e019a1871b39d50:/app/views/map_bugs/my_bugs.html.erb

diff --git a/app/views/map_bugs/my_bugs.html.erb b/app/views/map_bugs/my_bugs.html.erb
index 97e570060..d837c7829 100644
--- a/app/views/map_bugs/my_bugs.html.erb
+++ b/app/views/map_bugs/my_bugs.html.erb
@@ -4,42 +4,34 @@
 <%= render :partial => 'bugs_paging_nav' %>
 
 <table id="bug_list" cellpadding="3">
-	<tr>
-    	<th></th>
-		<th><%= t'bugs.user.id' %></th>
-		<th><%= t'changeset.changesets.user' %></th>
-		<th><%= t'changeset.changesets.comment' %></th>
-    	<th><%= t'changeset.changesets.saved_at' %></th>
-		<th><%= t'bugs.user.last_changed' %></th>
-    	
-    	
-  	</tr>
+  <tr>
+    <th></th>
+    <th><%= t'bugs.user.id' %></th>
+    <th><%= t'changeset.changesets.user' %></th>
+    <th><%= t'changeset.changesets.comment' %></th>
+    <th><%= t'changeset.changesets.saved_at' %></th>
+    <th><%= t'bugs.user.last_changed' %></th>
+  </tr>
 <% @bugs.each do |bug| %>
-<% if bug.map_bug_comment[0].user == @user2 %>
-	<tr>
-<% else %>	
-	<tr bgcolor=#EEEEEE>
-<% end %>	
-		<td>
-			<% if bug.status == "closed" %>
-				<%= image_tag("closed_bug_marker.png", :alt => 'closed') %>
-			<% else %>
-				<%= image_tag("open_bug_marker.png", :alt => 'open') %>
-			<% end %>
-		</td>
-		<td><%= link_to bug.id.to_s, :controller => "browse", :action => "bug", :id => bug.id %></td>
-		
-		<% if bug.map_bug_comment[0].user.nil? %> 
-			<td> <%= bug.map_bug_comment[0].commenter_name %> </td> 
-		<% else %> 
-			<td><%= link_to h(bug.map_bug_comment[0].user.display_name), :controller => "user", :action => "view", :display_name => bug.map_bug_comment[0].user.display_name %></td>
-        <% end %>
-		<td> <%= htmlize bug.map_bug_comment[0].comment  %> </td>	
-		<td><%= l bug.date_created %></td>
-		<td><%= l bug.last_changed %></td>
-	</tr>
+  <tr<% if bug.author != @user2 %> bgcolor="#EEEEEE"<% end %>>
+    <td>
+      <% if bug.status == "closed" %>
+        <%= image_tag("closed_bug_marker.png", :alt => 'closed') %>
+      <% else %>
+        <%= image_tag("open_bug_marker.png", :alt => 'open') %>
+      <% end %>
+    </td>
+    <td><%= link_to bug.id.to_s, :controller => "browse", :action => "bug", :id => bug.id %></td>
+    <% if bug.author.nil? %> 
+      <td> <%= bug.author_name %> </td> 
+    <% else %> 
+      <td><%= link_to h(bug.author_name), :controller => "user", :action => "view", :display_name => bug.author_name %></td>
+    <% end %>
+    <td> <%= htmlize bug.comments.first.body  %> </td>	
+    <td><%= l bug.created_at %></td>
+    <td><%= l bug.updated_at %></td>
+  </tr>
 <% end %>
 </table>
 
-
 <%= render :partial => 'bugs_paging_nav' %>