From a58d89ea95ac9510e1b258568f488aeb21376959 Mon Sep 17 00:00:00 2001 From: Eric Lindvall Date: Sun, 29 Mar 2009 22:34:18 -0700 Subject: [PATCH] Default sort type should work with all mapped columns. --- .../app/controllers/application_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/sortable_table/app/controllers/application_controller.rb b/lib/sortable_table/app/controllers/application_controller.rb index 3c89198..7e225e8 100644 --- a/lib/sortable_table/app/controllers/application_controller.rb +++ b/lib/sortable_table/app/controllers/application_controller.rb @@ -42,12 +42,13 @@ def define_sort_order(acceptable_columns, mappings) direction = default_sort_direction(params[:order], default) column = params[:sort] || default_sort_column self.sortable_table_direction = direction - if params[:sort] && acceptable_columns.include?(column) - column = mappings[column.to_sym] || column - handle_compound_sorting(column, sql_sort_direction(direction)) - else - "#{acceptable_columns.first} #{sql_sort_direction(direction)}" + + if !params[:sort] || !acceptable_columns.include?(column) + column = acceptable_columns.first end + + column = mappings[column.to_sym] || column + handle_compound_sorting(column, sql_sort_direction(direction)) end helper_method :sort_order, :default_sort_column, :sortable_table_direction