From 542b355210f901e9628127b8ae9a4de1787710f7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 16 Jun 2012 19:34:19 +0000 Subject: Fixed that sticky messages are not displayed first (#11170). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9836 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/boards_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 40552a0c9..3dea52bfb 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -43,10 +43,10 @@ class BoardsController < ApplicationController @topic_count = @board.topics.count @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page'] - @topics = @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '), + @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC").order(sort_clause).all( :include => [:author, {:last_reply => :author}], :limit => @topic_pages.items_per_page, - :offset => @topic_pages.current.offset + :offset => @topic_pages.current.offset) @message = Message.new(:board => @board) render :action => 'show', :layout => !request.xhr? } -- cgit v1.2.3