git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.7-stable@2185 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/0.7.4
@@ -42,7 +42,7 @@ 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}", | |||
@topics = @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '), | |||
:include => [:author, {:last_reply => :author}], | |||
:limit => @topic_pages.items_per_page, | |||
:offset => @topic_pages.current.offset |
@@ -84,14 +84,14 @@ module SortHelper | |||
session[@sort_name] = sort | |||
sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key]) | |||
@sort_clause = (sort_column.blank? ? '' : "#{sort_column} #{sort[:order]}") | |||
@sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}") | |||
end | |||
# Returns an SQL sort clause corresponding to the current sort state. | |||
# Use this to sort the controller's table items collection. | |||
# | |||
def sort_clause() | |||
@sort_clause || '' #session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC') | |||
@sort_clause | |||
end | |||
# Returns a link which sorts by the named column. |