diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 03ecd8235..30dca1c2a 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -60,6 +60,12 @@ class MemosController < ApplicationController @memo.update_attribute(:viewed_count, @memo.viewed_count.to_i + 1) page = params[:page] + if params[:r] && page.nil? + offset = @memo.children.where("#{Memo.table_name}.id < ?", params[:r].to_i).count + page = 1 + offset / pre_count + else + + end @reply_count = @memo.children.count @reply_pages = Paginator.new @reply_count, pre_count, page @replies = @memo.children. diff --git a/app/models/memo.rb b/app/models/memo.rb index 56dd3e99c..284d2ba1b 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -21,7 +21,7 @@ class Memo < ActiveRecord::Base :description => :content, :author => :author, :type => Proc.new {|o| o.parent_id.nil? ? 'Memo' : 'Reply'}, - :url => Proc.new {|o| {:controller => 'memos', :action => 'show', :forum_id => o.forum_id}.merge(o.parent_id.nil? ? {:id => o.id} : {:id => o.parent_id, :anchor => "reply-#{o.id}"})} + :url => Proc.new {|o| {:controller => 'memos', :action => 'show', :forum_id => o.forum_id}.merge(o.parent_id.nil? ? {:id => o.id} : {:id => o.parent_id, :r => o.id, :anchor => "reply-#{o.id}"})} acts_as_activity_provider :author_key => :author_id, :func => 'memos', :timestamp => 'created_at'