issues list bug fix

git-svn-id: http://redmine.rubyforge.org/svn/trunk@10 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/redmine/app/helpers/search_filter_helper.rb b/redmine/app/helpers/search_filter_helper.rb
index a5f0b91589ec0cf2d9a34489aae551c236689f40..98b281225f965559b0b0c717f5c431bd5be12c96 100644 (file)
--- a/redmine/app/helpers/search_filter_helper.rb
+++ b/redmine/app/helpers/search_filter_helper.rb
@@ -29,6 +29,7 @@ module SearchFilterHelper
   end\r
 \r
   def search_filter_update\r
+    session[:search_filter] ||= {}\r
     @search_filter.each_key {|field| session[:search_filter][field] = params[field]  }\r
   end\r
        \r
@@ -46,7 +47,9 @@ module SearchFilterHelper
   end\r
        \r
   def search_filter_tag(criteria, options = {})\r
+    session[:search_filter] ||= {}\r
     options[:name] = criteria\r
+    options[:class] += " active-filter" if session[:search_filter][criteria] and session[:search_filter][criteria] != @search_filter[criteria][:options][0][1]\r
     content_tag("select", \r
                                options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]),\r
                                options\r
@@ -76,12 +79,18 @@ module SearchFilterHelper
     ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] }                                                      \r
     }    \r
 \r
+    search_filter_criteria('fixed_version_id') { \r
+    [ [_('[All]'), "A", nil],\r
+      [_('[None]'), "N", ["issues.fixed_version_id is null"]]\r
+    ] + @project.versions.collect {|s| [s.name, s.id, ["issues.fixed_version_id=?", s.id]] }                                                      \r
+    }\r
+\r
     search_filter_criteria('assigned_to_id') { \r
     [ [_('[All]'), "A", nil],\r
       [_('[None]'), "N", ["issues.assigned_to_id is null"]]\r
     ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }                                                      \r
     }\r
-\r
+    \r
     search_filter_criteria('subproject_id') { \r
     [ [_('[None]'), "N", ["issues.project_id=?", @project.id]],\r
       [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]\r