deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3196 from Undev/feature/broken-projects-search-23049

Browse source 
Broken projects search on dashboard
This commit is contained in:
Dmitriy Zaporozhets 2013-03-12 04:31:57 -07:00
commit 6755d9908f
6 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/dashboard_controller.rb
View file

@ -34,6 +34,7 @@ class DashboardController < ApplicationController
@projects
end
@projects = @projects.search(params[:search]) if params[:search].present?
@projects = @projects.page(params[:page]).per(30)
end

2
app/views/dashboard/_filter.html.haml
View file

@ -1,6 +1,6 @@
= form_tag dashboard_filter_path(entity), method: 'get' do
%fieldset.dashboard-search-filter
= search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
= 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

2
app/views/dashboard/projects.html.haml
View file

@ -24,7 +24,7 @@
= form_tag projects_dashboard_path, method: 'get' do
%fieldset.dashboard-search-filter
= hidden_field_tag "scope", params[:scope]
= search_field_tag "search", params[:search], { placeholder: 'Search', class: 'left input-xxlarge' }
= search_field_tag "search", params[:search], { id: 'dashboard_projects_search', placeholder: 'Search', class: 'left input-xxlarge'}
= button_tag type: 'submit', class: 'btn' do
%i.icon-search