Commit 3b7998e19789e69cb483e05496900b8159c732df

Authored by Dmitriy Zaporozhets
1 parent ac7bb206

Milestone filter for issues improved

Showing 1 changed file with 5 additions and 4 deletions   Show diff stats
app/views/issues/index.html.haml
@@ -23,21 +23,22 @@ @@ -23,21 +23,22 @@
23 .span6 23 .span6
24 %ul.nav.nav-pills.left 24 %ul.nav.nav-pills.left
25 %li{:class => ("active" if (params[:f] == "0" || !params[:f]))} 25 %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
26 - = link_to project_issues_path(@project, :f => 0) do 26 + = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
27 Open 27 Open
28 %li{:class => ("active" if params[:f] == "2")} 28 %li{:class => ("active" if params[:f] == "2")}
29 - = link_to project_issues_path(@project, :f => 2) do 29 + = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
30 Closed 30 Closed
31 %li{:class => ("active" if params[:f] == "3")} 31 %li{:class => ("active" if params[:f] == "3")}
32 - = link_to project_issues_path(@project, :f => 3) do 32 + = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
33 To Me 33 To Me
34 %li{:class => ("active" if params[:f] == "1")} 34 %li{:class => ("active" if params[:f] == "1")}
35 - = link_to project_issues_path(@project, :f => 1) do 35 + = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
36 All 36 All
37 37
38 .span4.right 38 .span4.right
39 = form_tag project_issues_path(@project), :method => :get, :class => :right do 39 = form_tag project_issues_path(@project), :method => :get, :class => :right do
40 = select_tag(:milestone_id, options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Select milestone") 40 = select_tag(:milestone_id, options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Select milestone")
  41 + = hidden_field_tag :f, params[:f]
41 42
42 %ul#issues-table.unstyled 43 %ul#issues-table.unstyled
43 = render "issues" 44 = render "issues"