Refactor: Extract Query#sortable_columns from the controller.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3604 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-19 15:42:03 +00:00
parent 5e4eef1a4e
commit 6e6e260cea
2 changed files with 10 additions and 2 deletions
@@ -56,7 +56,7 @@ class IssuesController < ApplicationController
  def index
    retrieve_query
    sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
-    sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
+    sort_update(@query.sortable_columns)
    
    if @query.valid?
      limit = case params[:format]
@@ -94,7 +94,7 @@ class IssuesController < ApplicationController
  def changes
    retrieve_query
    sort_init 'id', 'desc'
-    sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
+    sort_update(@query.sortable_columns)
    
    if @query.valid?
      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",