| @@ -42,7 +42,7 class BoardsController < ApplicationController | |||
|
|
42 | 42 | |
|
|
43 | 43 | @topic_count = @board.topics.count |
|
|
44 | 44 | @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page'] |
|
|
45 |
@topics = @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC |
|
|
|
45 | @topics = @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '), | |
|
|
46 | 46 | :include => [:author, {:last_reply => :author}], |
|
|
47 | 47 | :limit => @topic_pages.items_per_page, |
|
|
48 | 48 | :offset => @topic_pages.current.offset |
| @@ -84,14 +84,14 module SortHelper | |||
|
|
84 | 84 | session[@sort_name] = sort |
|
|
85 | 85 | |
|
|
86 | 86 | sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key]) |
|
|
87 |
@sort_clause = (sort_column.blank? ? |
|
|
|
87 | @sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}") | |
|
|
88 | 88 | end |
|
|
89 | 89 | |
|
|
90 | 90 | # Returns an SQL sort clause corresponding to the current sort state. |
|
|
91 | 91 | # Use this to sort the controller's table items collection. |
|
|
92 | 92 | # |
|
|
93 | 93 | def sort_clause() |
|
|
94 | @sort_clause || '' #session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC') | |
|
|
94 | @sort_clause | |
|
|
95 | 95 | end |
|
|
96 | 96 | |
|
|
97 | 97 | # Returns a link which sorts by the named column. |
General Comments 0
You need to be logged in to leave comments.
Login now