##// END OF EJS Templates
jro_apps » redmine
RSS
Prevent SQL error with old sessions after r2171....
Jean-Philippe Lang -
r2181:fb1f72a09c64
parent child
Show More
Side by Side Unified
Context file:
r2181:fb1f72a09c64 Loading diff...:
Show file before | Show file after | Hide comments
@@ -42,7 +42,7 class BoardsController < ApplicationController
42
42
43 @topic_count = @board.topics.count
43 @topic_count = @board.topics.count
44 @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
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, #{sort_clause}",
45 @topics = @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '),
46 :include => [:author, {:last_reply => :author}],
46 :include => [:author, {:last_reply => :author}],
47 :limit => @topic_pages.items_per_page,
47 :limit => @topic_pages.items_per_page,
48 :offset => @topic_pages.current.offset
48 :offset => @topic_pages.current.offset
Show file before | Show file after | Hide comments
@@ -84,14 +84,14 module SortHelper
84 session[@sort_name] = sort
84 session[@sort_name] = sort
85
85
86 sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key])
86 sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key])
87 @sort_clause = (sort_column.blank? ? '' : "#{sort_column} #{sort[:order]}")
87 @sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}")
88 end
88 end
89
89
90 # Returns an SQL sort clause corresponding to the current sort state.
90 # Returns an SQL sort clause corresponding to the current sort state.
91 # Use this to sort the controller's table items collection.
91 # Use this to sort the controller's table items collection.
92 #
92 #
93 def sort_clause()
93 def sort_clause()
94 @sort_clause || '' #session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
94 @sort_clause
95 end
95 end
96
96
97 # Returns a link which sorts by the named column.
97 # Returns a link which sorts by the named column.
General Comments 0
You need to be logged in to leave comments. Login now