REmove duplicating search on dashboard issues/mr

Dmitriy Zaporozhets
1 parent 7406494a
Showing 4 changed files with 10 additions and 14 deletions Show diff stats
app/controllers/dashboard_controller.rb
app/views/dashboard/_filter.html.haml
app/views/dashboard/issues.html.haml
app/views/dashboard/merge_requests.html.haml
@@ -35,8 +35,6 @@ class DashboardController &lt; ApplicationController
                   current_user.authorized_projects
                 end.sorted_by_activity
  
-    @projects = @projects.search(params[:search]) if params[:search].present?
-
     @labels = current_user.authorized_projects.tags_on(:labels)
  
     @projects = @projects.tagged_with(params[:label]) if params[:label].present?
 = form_tag dashboard_filter_path(entity), method: 'get' do
-  %fieldset.dashboard-search-filter
-    = search_field_tag "search", params[:search], { id: 'filter_search', placeholder: 'Search', class: 'search-text-input' }
-    = button_tag type: 'submit', class: 'btn' do
-      %i.icon-search
-
   %fieldset
-    %legend Status:
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:status])}
         = link_to dashboard_filter_path(entity, status: nil) do
 %h3.page_title
   Issues
-  %small (assigned to you)
-  %small.pull-right #{@issues.total_count} issues
+  %span.light
+    &ndash;
+    Assigned to you
+  %span.pull-right #{@issues.total_count} issues
  
-%hr
+%br
  
 .row
   .span3
 %h3.page_title
   Merge Requests
-  %small (authored by or assigned to you)
-  %small.pull-right #{@merge_requests.total_count} merge requests
+  %span.light
+    &ndash;
+    Authored by or assigned to you
+  %span.pull-right #{@merge_requests.total_count} merge requests
  
-%hr
+%br
 .row
   .span3
     = render 'filter', entity: 'merge_request'
...	...	@@ -35,8 +35,6 @@ class DashboardController < ApplicationController
35	35	current_user.authorized_projects
36	36	end.sorted_by_activity
37	37
38		- @projects = @projects.search(params[:search]) if params[:search].present?
39		-
40	38	@labels = current_user.authorized_projects.tags_on(:labels)
41	39
42	40	@projects = @projects.tagged_with(params[:label]) if params[:label].present?
...	...
1	1	= form_tag dashboard_filter_path(entity), method: 'get' do
2		- %fieldset.dashboard-search-filter
3		- = search_field_tag "search", params[:search], { id: 'filter_search', placeholder: 'Search', class: 'search-text-input' }
4		- = button_tag type: 'submit', class: 'btn' do
5		- %i.icon-search
6		-
7	2	%fieldset
8		- %legend Status:
9	3	%ul.nav.nav-pills.nav-stacked
10	4	%li{class: ("active" if !params[:status])}
11	5	= link_to dashboard_filter_path(entity, status: nil) do
...	...
1	1	%h3.page_title
2	2	Issues
3		- %small (assigned to you)
4		- %small.pull-right #{@issues.total_count} issues
	3	+ %span.light
	4	+ –
	5	+ Assigned to you
	6	+ %span.pull-right #{@issues.total_count} issues
5	7
6		-%hr
	8	+%br
7	9
8	10	.row
9	11	.span3
...	...
1	1	%h3.page_title
2	2	Merge Requests
3		- %small (authored by or assigned to you)
4		- %small.pull-right #{@merge_requests.total_count} merge requests
	3	+ %span.light
	4	+ –
	5	+ Authored by or assigned to you
	6	+ %span.pull-right #{@merge_requests.total_count} merge requests
5	7
6		-%hr
	8	+%br
7	9	.row
8	10	.span3
9	11	= render 'filter', entity: 'merge_request'
...	...