From: Shrey <shrey14099@iiitd.ac.in>
Date: Thu, 16 Jul 2015 18:00:55 +0000 (+0530)
Subject: Fixed link to DiaryComments
X-Git-Tag: live~2953^2~136
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/732e1ab03a3b0f003dd8dc10e505d8d952fa18b9

Fixed link to DiaryComments
---

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index c0b6ece38..ed5a64057 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -152,6 +152,9 @@ 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 ef9ae20de..9ecb70e35 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -16,7 +16,8 @@ module IssuesHelper
 			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.id
+					                                                                   	:id => reportable.diary_entry.id,
+					                                                                   	:comment_id => reportable.id
 		when "Changeset"
 			link_to "Changeset ##{reportable.id}, Closed at: #{l(reportable.closed_at.to_datetime, :format => :long)}",		:controller => :browse,
 																									:action => :changeset,
diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index d12942a7b..8bc2b6469 100644
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -10,7 +10,11 @@
 
 <a id="comments"></a>
 <div class='comments'>
-<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
+  <% if @reported_comment %>
+    <%= render :partial => 'diary_comment', :collection => @reported_comment %>
+  <% else %>
+    <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
+  <% end %>
 </div>
 <%= if_logged_in(:div) do %>
   <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>