jro_apps/redmine Commit - r3259:8fb29d4d211a

Adds pagination to forum messages (#4664)....

Jean-Philippe Lang -

r3259:8fb29d4d211a

parent child

Context file:

r3259:8fb29d4d211a

Collapse all files

app/controllers/messages_controller.rb +19 -5

               helper :attachments
               include AttachmentsHelper
+              REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
               # Show a topic and its replies
               def show
-                @replies = @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}])
+                page = params[:page]
-                @replies.reverse! if User.current.wants_comments_in_reverse_order?
+                # Find the page of the requested reply
+                if params[:r] && page.nil?
+                  offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
+                  page = 1 + offset / REPLIES_PER_PAGE
+                end
+                @reply_count = @topic.children.count
+                @reply_pages = Paginator.new self, @reply_count, REPLIES_PER_PAGE, page
+                @replies =  @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}],
+                                                       :order => "#{Message.table_name}.created_on ASC",
+                                                       :limit => @reply_pages.items_per_page,
+                                                       :offset => @reply_pages.current.offset)
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?
               end
                   call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
                   attach_files(@reply, params[:attachments])
                 end
-                redirect_to :action => 'show', :id => @topic
+                redirect_to :action => 'show', :id => @topic, :r => @reply
               end
               # Edit a message
                   attach_files(@message, params[:attachments])
                   flash[:notice] = l(:notice_successful_update)
                   @message.reload
-                  redirect_to :action => 'show', :board_id => @message.board, :id => @message.root
+                  redirect_to :action => 'show', :board_id => @message.board, :id => @message.root, :r => (@message.parent_id && @message.id)
                 end
               end
                 @message.destroy
                 redirect_to @message.parent.nil? ?
                   { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
-                  { :action => 'show', :id => @message.parent }
+                  { :action => 'show', :id => @message.parent, :r => @message }
               end
               def quote

app/helpers/application_helper.rb +5 -4

               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
+                per_page_links = options.delete(:per_page_links)
                 url_param = params.dup
                 # don't reuse query params if filters are present
                 url_param.merge!(:fields => nil, :values => nil, :operators => nil) if url_param.delete(:set_filter)
                 end
                 unless count.nil?
-                  html << [
+                  html << " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})"
-                    " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})",
+                  if per_page_links != false && links = per_page_links(paginator.items_per_page)
-                    per_page_links(paginator.items_per_page)
+            	      html << " | #{links}"
-                  ].compact.join(' | ')
+                  end
                 end
                 html

app/helpers/messages_helper.rb +1 0

                                                        :action => 'show',
                                                        :board_id => message.board_id,
                                                        :id => message.root,
+                                                       :r => (message.parent_id && message.id),
                                                        :anchor => (message.parent_id ? "message-#{message.id}" : nil)
               end
             end

app/models/message.rb +1 -1

                             :description => :content,
                             :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
-                                                                                                                                                   {:id => o.parent_id, :anchor => "message-#{o.id}"})}
+                                                                                                                                                   {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"})}
               acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
                                         :author_key => :author_id

app/views/messages/show.rhtml +2 -1

             <br />
             <% unless @replies.empty? %>
-            <h3 class="comments"><%= l(:label_reply_plural) %></h3>
+            <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
             <% @replies.each do |message| %>
               <div class="message reply" id="<%= "message-#{message.id}" %>">
                 <div class="contextual">
               <%= link_to_attachments message, :author => false %>
               </div>
             <% end %>
+            <p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
             <% end %>
             <% if !@topic.locked? && authorize_for('messages', 'reply') %>

test/functional/messages_controller_test.rb +18 -1

@@ -47,6 +47,22 class MessagesControllerTest < ActionController::TestCase
47	assert_not_nil assigns(:topic)	47	assert_not_nil assigns(:topic)
48	end	48	end
49		49
		50	def test_show_with_pagination
		51	message = Message.find(1)
		52	assert_difference 'Message.count', 30 do
		53	30.times do
		54	message.children << Message.new(:subject => 'Reply', :content => 'Reply body', :author_id => 2, :board_id => 1)
		55	end
		56	end
		57	get :show, :board_id => 1, :id => 1, :r => message.children.last(:order => 'id').id
		58	assert_response :success
		59	assert_template 'show'
		60	replies = assigns(:replies)
		61	assert_not_nil replies
		62	assert !replies.include?(message.children.first(:order => 'id'))
		63	assert replies.include?(message.children.last(:order => 'id'))
		64	end
		65
50	def test_show_with_reply_permission	66	def test_show_with_reply_permission
51	@request.session[:user_id] = 2	67	@request.session[:user_id] = 2
52	get :show, :board_id => 1, :id => 1	68	get :show, :board_id => 1, :id => 1
@@ -143,7 +159,8 class MessagesControllerTest < ActionController::TestCase
143	def test_reply	159	def test_reply
144	@request.session[:user_id] = 2	160	@request.session[:user_id] = 2
145	post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }	161	post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
146	assert_redirected_to 'boards/1/topics/1'	162	reply = Message.find(:first, :order => 'id DESC')
		163	assert_redirected_to "boards/1/topics/1?r=#{reply.id}"
147	assert Message.find_by_subject('Test reply')	164	assert Message.find_by_subject('Test reply')
148	end	165	end
149		166

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages