VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-20 14:11:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

REmove duplicating search on dashboard issues/mr

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-07-12 21:49:03 +03:00
parent 7406494abc
commit 3b660be6ee
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/dashboard_controller.rb
View File

@ -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?

6
app/views/dashboard/_filter.html.haml
View File

@ -1,11 +1,5 @@
= 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

8
app/views/dashboard/issues.html.haml
View File

@ -1,9 +1,11 @@
%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

8
app/views/dashboard/merge_requests.html.haml
View File

@ -1,9 +1,11 @@
%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'