cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed link to DiaryComments

Browse source
This commit is contained in:
Shrey 2015-07-16 23:30:55 +05:30 • committed by Matt Amos
parent 4b4b67aa96
commit 732e1ab03a
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/diary_entry_controller.rb
View file

@ -152,6 +152,9 @@ class DiaryEntryController < ApplicationController
@entry = @this_user.diary_entries.visible.where(:id => params[:id]).first @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
if @entry if @entry
@title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title @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 else
@title = t "diary_entry.no_such_entry.title", :id => params[:id] @title = t "diary_entry.no_such_entry.title", :id => params[:id]
render :action => "no_such_entry", :status => :not_found render :action => "no_such_entry", :status => :not_found

3
app/helpers/issues_helper.rb
View file

@ -16,7 +16,8 @@ module IssuesHelper
link_to "#{reportable.diary_entry.title}, Comment id ##{reportable.id}", :controller => reportable.diary_entry.class.name.underscore, link_to "#{reportable.diary_entry.title}, Comment id ##{reportable.id}", :controller => reportable.diary_entry.class.name.underscore,
:action => :view, :action => :view,
:display_name => reportable.diary_entry.user.display_name, :display_name => reportable.diary_entry.user.display_name,
:id => reportable.id :id => reportable.diary_entry.id,
:comment_id => reportable.id
when "Changeset" when "Changeset"
link_to "Changeset ##{reportable.id}, Closed at: #{l(reportable.closed_at.to_datetime, :format => :long)}", :controller => :browse, link_to "Changeset ##{reportable.id}, Closed at: #{l(reportable.closed_at.to_datetime, :format => :long)}", :controller => :browse,
:action => :changeset, :action => :changeset,

6
app/views/diary_entry/view.html.erb
View file

@ -10,7 +10,11 @@
<a id="comments"></a> <a id="comments"></a>
<div class='comments'> <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> </div>
<%= if_logged_in(:div) do %> <%= if_logged_in(:div) do %>
<h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3> <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>