From 89d0d75c528b7b39471966db260c002383ccb9db Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 7 Aug 2013 23:54:26 +0300
Subject: [PATCH] Better filter var for MR. show reset filter only if makes sense

---
 app/contexts/merge_requests_load_context.rb         |  2 +-
 app/views/projects/issues/_filter.html.haml         |  7 +++++--
 app/views/projects/merge_requests/_filter.html.haml | 23 ++++++++++++-----------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/contexts/merge_requests_load_context.rb b/app/contexts/merge_requests_load_context.rb
index fd44572..fc7318e 100644
--- a/app/contexts/merge_requests_load_context.rb
+++ b/app/contexts/merge_requests_load_context.rb
@@ -2,7 +2,7 @@
 # based on filtering passed via params for @project
 class MergeRequestsLoadContext < BaseContext
   def execute
-    type = params[:f]
+    type = params[:status]
 
     merge_requests = project.merge_requests
 
diff --git a/app/views/projects/issues/_filter.html.haml b/app/views/projects/issues/_filter.html.haml
index 8495c32..663d786 100644
--- a/app/views/projects/issues/_filter.html.haml
+++ b/app/views/projects/issues/_filter.html.haml
@@ -18,6 +18,9 @@
           All
 
   %fieldset
-    %hr
-    = link_to "Reset", project_issues_path(@project), class: 'btn pull-right'
+    - if %w(status milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
+      = link_to project_issues_path(@project), class: 'cgray pull-right' do
+        %i.icon-remove
+        Clear filter
+
 
diff --git a/app/views/projects/merge_requests/_filter.html.haml b/app/views/projects/merge_requests/_filter.html.haml
index 4b48306..9f09a7e 100644
--- a/app/views/projects/merge_requests/_filter.html.haml
+++ b/app/views/projects/merge_requests/_filter.html.haml
@@ -1,20 +1,21 @@
 = form_tag project_issues_path(@project), method: 'get' do
   %fieldset
     %ul.nav.nav-pills.nav-stacked
-      %li{class: ("active" if (params[:f] == 'open' || !params[:f]))}
-        = link_to project_merge_requests_path(@project, f: 'open', milestone_id: params[:milestone_id]) do
+      %li{class: ("active" if (params[:status] == 'open' || !params[:status]))}
+        = link_to project_merge_requests_path(@project, status: 'open', milestone_id: params[:milestone_id]) do
           Open
-      %li{class: ("active" if params[:f] == "closed")}
-        = link_to project_merge_requests_path(@project, f: "closed", milestone_id: params[:milestone_id]) do
+      %li{class: ("active" if params[:status] == "closed")}
+        = link_to project_merge_requests_path(@project, status: "closed", milestone_id: params[:milestone_id]) do
           Closed
-      %li{class: ("active" if params[:f] == 'assigned-to-me')}
-        = link_to project_merge_requests_path(@project, f: 'assigned-to-me', milestone_id: params[:milestone_id]) do
+      %li{class: ("active" if params[:status] == 'assigned-to-me')}
+        = link_to project_merge_requests_path(@project, status: 'assigned-to-me', milestone_id: params[:milestone_id]) do
           Assigned To Me
-      %li{class: ("active" if params[:f] == 'all')}
-        = link_to project_merge_requests_path(@project, f: 'all', milestone_id: params[:milestone_id]) do
+      %li{class: ("active" if params[:status] == 'all')}
+        = link_to project_merge_requests_path(@project, status: 'all', milestone_id: params[:milestone_id]) do
           All
 
   %fieldset
-    %hr
-    = link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'
-
+    - if %w(status milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
+      = link_to project_merge_requests_path(@project), class: 'cgray pull-right' do
+        %i.icon-remove
+        Clear filter
--
libgit2 0.21.2