Commit 6e1ee1fe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

made some ui enhancement for search page

parent f1126f49
...@@ -6,7 +6,8 @@ class SearchController < ApplicationController ...@@ -6,7 +6,8 @@ class SearchController < ApplicationController
project_ids = current_user.authorized_projects.map(&:id) project_ids = current_user.authorized_projects.map(&:id)
if group_id.present? if group_id.present?
group_project_ids = Group.find(group_id).projects.map(&:id) @group = Group.find(group_id)
group_project_ids = @group.projects.map(&:id)
project_ids.select! { |id| group_project_ids.include?(id)} project_ids.select! { |id| group_project_ids.include?(id)}
elsif project_id.present? elsif project_id.present?
project_ids.select! { |id| id == project_id.to_i} project_ids.select! { |id| id == project_id.to_i}
......
%fieldset .dropdown.inline
%legend Groups: %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
.clearfix %i.icon-tags
= select_tag 'group_id', options_from_collection_for_select(current_user.authorized_groups, :id, :name, params[:group_id]), prompt: 'All', include_blank: true, class: 'trigger-submit chosen' %span.light Group:
- if @group.present?
%strong= @group.name
%fieldset - else
%legend Teams: Any
.clearfix %b.caret
= select_tag 'team_id', options_from_collection_for_select(current_user.authorized_teams, :id, :name, params[:team_id]), prompt: 'All', include_blank: true, class: 'trigger-submit chosen' %ul.dropdown-menu
%li
%fieldset = link_to search_path(group_id: nil) do
%legend Projects: Any
.clearfix - current_user.authorized_groups.sort_by(&:name).each do |group|
= select_tag 'project_id', options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace, params[:project_id]), prompt: 'All', include_blank: true, class: 'trigger-submit chosen' %li
= link_to search_path(group_id: group.id, search: params[:search]) do
= group.name
.dropdown.inline.prepend-left-10
%a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
%i.icon-tags
%span.light Project:
- if @project.present?
%strong= @project.name_with_namespace
- else
Any
%b.caret
%ul.dropdown-menu
%li
= link_to search_path(project_id: nil) do
Any
- current_user.authorized_projects.sort_by(&:name_with_namespace).each do |project|
%li
= link_to search_path(project_id: project.id, search: params[:search]) do
= project.name_with_namespace
...@@ -6,11 +6,9 @@ ...@@ -6,11 +6,9 @@
= search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search" = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
= hidden_field_tag :search_code, params[:search_code] = hidden_field_tag :search_code, params[:search_code]
= submit_tag 'Search', class: "btn btn-primary wide" = submit_tag 'Search', class: "btn btn-primary wide"
.clearfix .prepend-top-10
.row
.span3
= render 'filter', f: f = render 'filter', f: f
.span9
.results .results.prepend-top-10
- if params[:search].present? - if params[:search].present?
= render 'search/result' = render 'search/result'
...@@ -6,6 +6,7 @@ class ProjectSearchCode < Spinach::FeatureSteps ...@@ -6,6 +6,7 @@ class ProjectSearchCode < Spinach::FeatureSteps
When 'I search for term "Welcome to Gitlab"' do When 'I search for term "Welcome to Gitlab"' do
fill_in "search", with: "Welcome to Gitlab" fill_in "search", with: "Welcome to Gitlab"
click_button "Go" click_button "Go"
click_link 'Repository Code'
end end
Then 'I should see files from repository containing "Welcome to Gitlab"' do Then 'I should see files from repository containing "Welcome to Gitlab"' do
......
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