diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-03-19 15:42:03 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-03-19 15:42:03 +0000 |
| commit | 6e6e260ceae699d44be8bccc66ec0566695091a0 (patch) | |
| tree | 1753dec7162233cc7196926f0e76c00756d73f2e /app/controllers | |
| parent | 5e4eef1a4e959d55d8cb9613a9116b735fbd0a5c (diff) | |
| download | redmine-6e6e260ceae699d44be8bccc66ec0566695091a0.tar.gz redmine-6e6e260ceae699d44be8bccc66ec0566695091a0.zip | |
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
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/issues_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 68d3c94f7..a598ac8f5 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -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", |