From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 03:24:00 +0000 (+0800)
Subject: Link to diary comments using anchors, rather than showing them alone
X-Git-Tag: live~2953^2~54
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b955a7e78ea75ea5587d4bee0d64254e4b2d74eb

Link to diary comments using anchors, rather than showing them alone

Neither way is perfect, but this is less surprising than seeing a diary
entry with only one comment visible.
---

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 88febbe2f..9e0fd4991 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -186,9 +186,6 @@ class DiaryEntryController < ApplicationController
     @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
     if @entry
       @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title
-      if params[:comment_id]
-        @reported_comment = DiaryComment.where(:id => params[:comment_id])
-      end
     else
       @title = t "diary_entry.no_such_entry.title", :id => params[:id]
       render :action => "no_such_entry", :status => :not_found
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 27a51c0fb..8452cbd60 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -7,7 +7,7 @@ module IssuesHelper
     when "User"
       link_to reportable.display_name.to_s, :controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name
     when "DiaryComment"
-      link_to "#{reportable.diary_entry.title}, Comment id ##{reportable.id}", :controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :comment_id => reportable.id
+      link_to "#{reportable.diary_entry.title}, Comment id ##{reportable.id}", :controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}"
     when "Changeset"
       link_to "Changeset ##{reportable.id}", :controller => :browse, :action => :changeset, :id => reportable.id
     when "Note"
@@ -39,7 +39,7 @@ module IssuesHelper
     when "User"
       link_to "Show Instance", :controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name
     when "DiaryComment"
-      link_to "Show Instance", :controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :comment_id => reportable.id
+      link_to "Show Instance", :controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}"
     when "Changeset"
       link_to "Show Instance", :controller => :browse, :action => :changeset, :id => reportable.id
     when "Note"
diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 5079074e8..3c2264d3e 100644
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -10,11 +10,7 @@
 
 <a id="comments"></a>
 <div class='comments'>
-  <% if @reported_comment %>
-    <%= render :partial => 'diary_comment', :collection => @reported_comment %>
-  <% else %>
-    <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
-  <% end %>
+<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 </div>
 <%= if_logged_in(:div) do %>
   <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>