diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-15 20:22:23 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-15 20:22:23 +0000 |
| commit | a8137d5d1780fcc6d4a5aee4866baa10c2a0bddd (patch) | |
| tree | ed9bc8f41da462077fe89f34fdc1caf6a8f97788 /app/models/query.rb | |
| parent | 1e5362b1f77d2880d6b3e4971f2d3dca343a7038 (diff) | |
| download | redmine-a8137d5d1780fcc6d4a5aee4866baa10c2a0bddd.tar.gz redmine-a8137d5d1780fcc6d4a5aee4866baa10c2a0bddd.zip | |
added back "fixed version" in issue/show and filters
git-svn-id: http://redmine.rubyforge.org/svn/trunk@165 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/query.rb')
| -rw-r--r-- | app/models/query.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 4ac34bd6d..dbde65a15 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -72,16 +72,17 @@ class Query < ActiveRecord::Base @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all).collect{|s| [s.name, s.id.to_s] } }, "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all).collect{|s| [s.name, s.id.to_s] } }, "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } }, - "subject" => { :type => :text, :order => 7 }, - "created_on" => { :type => :date_past, :order => 8 }, - "updated_on" => { :type => :date_past, :order => 9 }, - "start_date" => { :type => :date, :order => 10 }, - "due_date" => { :type => :date, :order => 11 } } + "subject" => { :type => :text, :order => 8 }, + "created_on" => { :type => :date_past, :order => 9 }, + "updated_on" => { :type => :date_past, :order => 10 }, + "start_date" => { :type => :date, :order => 11 }, + "due_date" => { :type => :date, :order => 12 } } unless project.nil? # project specific filters @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } } @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } } @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } } + @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } } # remove category filter if no category defined @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty? end |