Commit 3b660be6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

REmove duplicating search on dashboard issues/mr

parent 7406494a
......@@ -35,8 +35,6 @@ class DashboardController < 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'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment