X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff97501ed01488f8ff8e9d2e7b93b4f295f71725..506c0b5f0db8aca79ef61fa45cad508b7167817a:/app/controllers/diary_entry_controller.rb diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 19bc84ac7..89107ab1a 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -138,6 +138,8 @@ class DiaryEntryController < ApplicationController end end + @params = params.permit(:display_name, :friends, :nearby, :language) + @page = (params[:page] || 1).to_i @page_size = 20 @@ -183,6 +185,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