Use association names with :joins instead of writing the SQL for the

[rails.git] / app / views / changeset / _changeset.rhtml

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.rhtml
index 69d8933f650b630acb4f21d4e950fef329c1f7c5..4012c41a3aa209e3afeca476da6f7749363a3b9e 100644 (file)
--- a/app/views/changeset/_changeset.rhtml
+++ b/app/views/changeset/_changeset.rhtml
@@ -3,32 +3,47 @@
 
   <td class="<%= cl %>">
     #<%= changeset.id %>
+  </td>
 
   <td class="<%= cl %>">
     <% if changeset.closed_at > DateTime.now %> (still editing)
     <% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
+  </td>
 
+    
+  <%if showusername %>  
+    <td class="<%= cl %>">
+    <% if changeset.user.data_public? %>
+      <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
+    <% else %>
+      <i>Anonymous</i>
+    <% end %>
+    </td>
+  <% end %>
+    
   <td class="<%= cl %>">
     <% if changeset.tags['comment'] %>
-      <%= changeset.tags['comment'] %>
+      <%= h(changeset.tags['comment']) %>
     <% else %>
       (none)
     <% end %>
+  </td>
 
   <td class="<%= cl %>">
     <% if changeset.min_lat.nil? %>
       (no edits)
     <% else 
-      lat1 = changeset.min_lat/GeoRecord::SCALE.to_f
-      lat2 = changeset.max_lat/GeoRecord::SCALE.to_f
-      lon1 = changeset.min_lon/GeoRecord::SCALE.to_f
-      lon2 = changeset.max_lon/GeoRecord::SCALE.to_f
+      minlon = changeset.min_lon/GeoRecord::SCALE.to_f
+      minlat = changeset.min_lat/GeoRecord::SCALE.to_f
+      maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
+      maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
     %>
-      (<a href='/?lat=<%= lat1 %>&lon=<%= lon1 %>&zoom=14'><%= format("%0.3f",lat1) -%>,<%= format("%0.3f",lon1) -%></a>) to 
-      (<a href='/?lat=<%= lat2 %>&lon=<%= lon2 %>&zoom=14'><%= format("%0.3f",lat2) -%>,<%= format("%0.3f",lon2) -%></a>) 
+      (<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>) 
   <% end %>
+  </td>
 
   <td class="<%= cl %>">
     <%= link_to 'more', {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => 'View changeset details'} %> 
+  </td>
 
 </tr>