Fixed link to DiaryComments
This commit is contained in:
parent
4b4b67aa96
commit
732e1ab03a
3 changed files with 10 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -10,7 +10,11 @@
|
|||
|
||||
<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 %>
|
||||
</div>
|
||||
<%= if_logged_in(:div) do %>
|
||||
<h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue