Default sort type should work with all mapped columns.

JackDanger · Mar 30, 2009 · a58d89e · a58d89e
1 parent 9b4f9d2
commit a58d89e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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