diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-03-12 18:06:54 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-03-12 18:06:54 +0000 |
| commit | c7c8dc71f2fc8f224deb0a5340f7bbb8906e584d (patch) | |
| tree | de3c8964542f8bb72cef67f462df910c4e6446f7 /app/controllers | |
| parent | 2b585407cb66a26f81ea0bcb8a922dd1203e25e0 (diff) | |
| download | redmine-c7c8dc71f2fc8f224deb0a5340f7bbb8906e584d.tar.gz redmine-c7c8dc71f2fc8f224deb0a5340f7bbb8906e584d.zip | |
Ability to save "sort order" in custom queries (#2899).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2572 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/issues_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 0af5f192a..929b928ac 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -45,7 +45,7 @@ class IssuesController < ApplicationController def index retrieve_query - sort_init 'id', 'desc' + sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h})) if @query.valid? @@ -471,6 +471,7 @@ private @query = Query.find(params[:query_id], :conditions => cond) @query.project = @project session[:query] = {:id => @query.id, :project_id => @query.project_id} + sort_clear else if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) # Give it a name, required to be valid |