Skip to content

O
OHR Support
Commit 6e6e260c authored by Eric Davis's avatar Eric Davis
Browse files
Options

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
parent 5e4eef1a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
app/controllers/issues_controller.rb
View file @ 6e6e260c
......@@ -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",
......
app/models/query.rb
View file @ 6e6e260c
......@@ -270,6 +270,14 @@ class Query < ActiveRecord::Base
def groupable_columns
available_columns.select {|c| c.groupable}
end
# Returns a Hash of columns and the key for sorting
def sortable_columns
{'id' => "#{Issue.table_name}.id"}.merge(available_columns.inject({}) {|h, column|
h[column.name.to_s] = column.sortable
h
})
end
def columns
if has_default_columns?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment