Fixed link to DiaryComments

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index c0b6ece3843dca44b75a415059815e9c92b3e7bd..ed5a640579b713d4f63683ad824f94cb5b3e04f4 100644 (file)
--- 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
     @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
     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 ef9ae20de9626b90ce6c063073636ac9c31a1665..9ecb70e3540295ca5fb2c49f5f43da5251437de2 100644 (file)
--- 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,
                        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,
                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 d12942a7b9b9f98f8286afde37f359fc6dd5f774..8bc2b64693aa34ecb90339c83d54d46ae8c960ea 100644 (file)
--- 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'>
 
 <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>
 </div>
 <%= if_logged_in(:div) do %>
   <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>