From: Tom Hughes <tom@compton.nu>
Date: Sun, 8 Dec 2013 13:11:48 +0000 (+0000)
Subject: Don't linkify comments in the changeset list
X-Git-Tag: live~4522
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5c53bb78ab8a7292b489d7f8d1f38ba17a0287e6

Don't linkify comments in the changeset list

It's confusing to make links in comments active in the changeset list
as the rest of the comment is an active link to the changeset.

We do want to make them active in the changeset view however, so add
linkification to the comment there.

Fixes https://trac.openstreetmap.org/ticket/5061
---

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 736abf12f..31799f0e9 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -6,7 +6,7 @@
 </h2>
 
 <div class="browse-section">
-  <h4><%= @changeset.tags['comment'].to_s.presence || t('browse.no_comment') %></h4>
+  <h4><%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %></h4>
   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 5c5ad670b..cbc60695b 100644
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -15,11 +15,7 @@
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
   <h4>
     <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
-      <% if changeset.tags['comment'].to_s != '' %>
-        <%= linkify(h(changeset.tags['comment'])) %>
-      <% else %>
-        <%= t 'browse.no_comment' %>
-      <% end %>
+      <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
     </a>
   </h4>
   <div class="details">