X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ccd7882bcfdda436e1b89422a96026ce328c261b..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/controllers/diary_entry_controller.rb?ds=inline diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 61194f655..f87b02ef9 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -140,7 +140,7 @@ class DiaryEntryController < ApplicationController end def rss - @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(500) + @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20) if params[:display_name] user = User.active.find_by_display_name(params[:display_name]) @@ -195,6 +195,22 @@ class DiaryEntryController < ApplicationController comment.update_attributes(:visible => false) redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id end + + def comments + @this_user = User.active.find_by_display_name(params[:display_name]) + + if @this_user + @comment_pages, @comments = paginate(:diary_comments, + :conditions => { :user_id => @this_user }, + :order => 'created_at DESC', + :per_page => 20) + @page = (params[:page] || 1).to_i + else + @title = t'diary_entry.no_such_user.title' + @not_found_user = params[:display_name] + render :action => 'no_such_user', :status => :not_found + end + end private ## # require that the user is a administrator, or fill out a helpful error message