jro_apps/redmine Commit - r8:71c3ad642c1f

29

end

29

end

30

31

def search_filter_update

31

def search_filter_update

32

session[:search_filter] ||= {}

32

@search_filter.each_key {|field| session[:search_filter][field] = params[field] }

33

@search_filter.each_key {|field| session[:search_filter][field] = params[field] }

33

end

34

end

34

35

46

end

47

end

47

48

def search_filter_tag(criteria, options = {})

49

def search_filter_tag(criteria, options = {})

50

session[:search_filter] ||= {}

49

options[:name] = criteria

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

content_tag("select",

53

content_tag("select",

51

options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]),

54

options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]),

52

options

55

options

76

] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] }

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

search_filter_criteria('assigned_to_id') {

88

search_filter_criteria('assigned_to_id') {

80

[ [_('[All]'), "A", nil],

89

[ [_('[All]'), "A", nil],

81

[_('[None]'), "N", ["issues.assigned_to_id is null"]]

90

[_('[None]'), "N", ["issues.assigned_to_id is null"]]

82

] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }

91

] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }

83

}

92

}

84

93

85

search_filter_criteria('subproject_id') {

94

search_filter_criteria('subproject_id') {

86

[ [_('[None]'), "N", ["issues.project_id=?", @project.id]],

95

[ [_('[None]'), "N", ["issues.project_id=?", @project.id]],

87

[_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]

96

[_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

               end
               def search_filter_update
+                session[:search_filter] ||= {}
                 @search_filter.each_key {|field| session[:search_filter][field] = params[field]  }
               end
               end
               def search_filter_tag(criteria, options = {})
+                session[:search_filter] ||= {}
                 options[:name] = criteria
+                options[:class] += " active-filter" if session[:search_filter][criteria] and session[:search_filter][criteria] != @search_filter[criteria][:options][0][1]
                 content_tag("select",
             				options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]),
             				options
                 ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] }
                 }
+                search_filter_criteria('fixed_version_id') {
+                [ [_('[All]'), "A", nil],
+                  [_('[None]'), "N", ["issues.fixed_version_id is null"]]
+                ] + @project.versions.collect {|s| [s.name, s.id, ["issues.fixed_version_id=?", s.id]] }
+                }
                 search_filter_criteria('assigned_to_id') {
                 [ [_('[All]'), "A", nil],
                   [_('[None]'), "N", ["issues.assigned_to_id is null"]]
                 ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }
                 }
                 search_filter_criteria('subproject_id') {
                 [ [_('[None]'), "N", ["issues.project_id=?", @project.id]],
                   [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]