diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-16 19:34:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-16 19:34:19 +0000 |
| commit | 542b355210f901e9628127b8ae9a4de1787710f7 (patch) | |
| tree | 236a7b5903ffe42be2e22846996f3692c68f86e9 /app/controllers | |
| parent | 897e83a556374ee47a8b55bac21e40f323adbd96 (diff) | |
| download | redmine-542b355210f901e9628127b8ae9a4de1787710f7.tar.gz redmine-542b355210f901e9628127b8ae9a4de1787710f7.zip | |
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
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/boards_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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? } |