| @@ -29,6 +29,7 module SearchFilterHelper | |||
|
|
29 | 29 | end |
|
|
30 | 30 | |
|
|
31 | 31 | def search_filter_update |
|
|
32 | session[:search_filter] ||= {} | |
|
|
32 | 33 | @search_filter.each_key {|field| session[:search_filter][field] = params[field] } |
|
|
33 | 34 | end |
|
|
34 | 35 | |
| @@ -46,7 +47,9 module SearchFilterHelper | |||
|
|
46 | 47 | end |
|
|
47 | 48 | |
|
|
48 | 49 | def search_filter_tag(criteria, options = {}) |
|
|
50 | session[:search_filter] ||= {} | |
|
|
49 | 51 | options[:name] = criteria |
|
|
52 | options[:class] += " active-filter" if session[:search_filter][criteria] and session[:search_filter][criteria] != @search_filter[criteria][:options][0][1] | |
|
|
50 | 53 | content_tag("select", |
|
|
51 | 54 | options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]), |
|
|
52 | 55 | options |
| @@ -76,12 +79,18 module SearchFilterHelper | |||
|
|
76 | 79 | ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] } |
|
|
77 | 80 | } |
|
|
78 | 81 | |
|
|
82 | search_filter_criteria('fixed_version_id') { | |
|
|
83 | [ [_('[All]'), "A", nil], | |
|
|
84 | [_('[None]'), "N", ["issues.fixed_version_id is null"]] | |
|
|
85 | ] + @project.versions.collect {|s| [s.name, s.id, ["issues.fixed_version_id=?", s.id]] } | |
|
|
86 | } | |
|
|
87 | ||
|
|
79 | 88 | search_filter_criteria('assigned_to_id') { |
|
|
80 | 89 | [ [_('[All]'), "A", nil], |
|
|
81 | 90 | [_('[None]'), "N", ["issues.assigned_to_id is null"]] |
|
|
82 | 91 | ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] } |
|
|
83 | 92 | } |
|
|
84 | ||
|
|
93 | ||
|
|
85 | 94 | search_filter_criteria('subproject_id') { |
|
|
86 | 95 | [ [_('[None]'), "N", ["issues.project_id=?", @project.id]], |
|
|
87 | 96 | [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]] |
General Comments 0
You need to be logged in to leave comments.
Login now