Fixed that messages are not sorted by last reply (#12243).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 11:10:17 +00:00
parent dbf1fed6fb
commit c17ec1643c
2 changed files with 18 additions and 2 deletions
@@ -39,16 +39,17 @@ class BoardsController < ApplicationController
        sort_init 'updated_on', 'desc'
        sort_update 'created_on' => "#{Message.table_name}.created_on",
                    'replies' => "#{Message.table_name}.replies_count",
-                    'updated_on' => "#{Message.table_name}.updated_on"
+                    'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"

        @topic_count = @board.topics.count
        @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
        @topics =  @board.topics.
          reorder("#{Message.table_name}.sticky DESC").
-          includes(:author, {:last_reply => :author}).
+          includes(:last_reply).
          limit(@topic_pages.items_per_page).
          offset(@topic_pages.offset).
          order(sort_clause).
+          preload(:author, {:last_reply => :author}).
          all
        @message = Message.new(:board => @board)
        render :action => 'show', :layout => !request.xhr?