Download as
Browse Code »

Commit 89d0d75c528b7b39471966db260c002383ccb9db

Authored by Dmitriy Zaporozhets
1 parent a43a3803
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Better filter var for MR. show reset filter only if makes sense

Showing 3 changed files with 18 additions and 14 deletions   Show diff stats
app/contexts/merge_requests_load_context.rb
  Diff comments   View file @89d0d75
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # based on filtering passed via params for @project 2 # based on filtering passed via params for @project
3 class MergeRequestsLoadContext < BaseContext 3 class MergeRequestsLoadContext < BaseContext
4 def execute 4 def execute
5 - type = params[:f] 5 + type = params[:status]
6 6
7 merge_requests = project.merge_requests 7 merge_requests = project.merge_requests
8 8
app/views/projects/issues/_filter.html.haml
  Diff comments   View file @89d0d75
@@ -18,6 +18,9 @@ @@ -18,6 +18,9 @@
18 All 18 All
19 19
20 %fieldset 20 %fieldset
21 - %hr  
22 - = link_to "Reset", project_issues_path(@project), class: 'btn pull-right' 21 + - if %w(status milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
  22 + = link_to project_issues_path(@project), class: 'cgray pull-right' do
  23 + %i.icon-remove
  24 + Clear filter
  25 +
23 26
app/views/projects/merge_requests/_filter.html.haml
  Diff comments   View file @89d0d75
1 = form_tag project_issues_path(@project), method: 'get' do 1 = form_tag project_issues_path(@project), method: 'get' do
2 %fieldset 2 %fieldset
3 %ul.nav.nav-pills.nav-stacked 3 %ul.nav.nav-pills.nav-stacked
4 - %li{class: ("active" if (params[:f] == 'open' || !params[:f]))}  
5 - = link_to project_merge_requests_path(@project, f: 'open', milestone_id: params[:milestone_id]) do 4 + %li{class: ("active" if (params[:status] == 'open' || !params[:status]))}
  5 + = link_to project_merge_requests_path(@project, status: 'open', milestone_id: params[:milestone_id]) do
6 Open 6 Open
7 - %li{class: ("active" if params[:f] == "closed")}  
8 - = link_to project_merge_requests_path(@project, f: "closed", milestone_id: params[:milestone_id]) do 7 + %li{class: ("active" if params[:status] == "closed")}
  8 + = link_to project_merge_requests_path(@project, status: "closed", milestone_id: params[:milestone_id]) do
9 Closed 9 Closed
10 - %li{class: ("active" if params[:f] == 'assigned-to-me')}  
11 - = link_to project_merge_requests_path(@project, f: 'assigned-to-me', milestone_id: params[:milestone_id]) do 10 + %li{class: ("active" if params[:status] == 'assigned-to-me')}
  11 + = link_to project_merge_requests_path(@project, status: 'assigned-to-me', milestone_id: params[:milestone_id]) do
12 Assigned To Me 12 Assigned To Me
13 - %li{class: ("active" if params[:f] == 'all')}  
14 - = link_to project_merge_requests_path(@project, f: 'all', milestone_id: params[:milestone_id]) do 13 + %li{class: ("active" if params[:status] == 'all')}
  14 + = link_to project_merge_requests_path(@project, status: 'all', milestone_id: params[:milestone_id]) do
15 All 15 All
16 16
17 %fieldset 17 %fieldset
18 - %hr  
19 - = link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'  
20 - 18 + - if %w(status milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
  19 + = link_to project_merge_requests_path(@project), class: 'cgray pull-right' do
  20 + %i.icon-remove
  21 + Clear filter