Remove separate search page from group
This commit is contained in:
parent
cc1dd624aa
commit
f4f36f78dd
3 changed files with 0 additions and 20 deletions
|
@ -59,15 +59,6 @@ class GroupsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def search
|
|
||||||
result = SearchContext.new(project_ids, params).execute
|
|
||||||
|
|
||||||
@projects = result[:projects]
|
|
||||||
@merge_requests = result[:merge_requests]
|
|
||||||
@issues = result[:issues]
|
|
||||||
@wiki_pages = result[:wiki_pages]
|
|
||||||
end
|
|
||||||
|
|
||||||
def people
|
def people
|
||||||
@project = group.projects.find(params[:project_id]) if params[:project_id]
|
@project = group.projects.find(params[:project_id]) if params[:project_id]
|
||||||
@users = @project ? @project.users : group.users
|
@users = @project ? @project.users : group.users
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
= form_tag search_group_path(@group), method: :get, class: 'form-inline' do |f|
|
|
||||||
.padded
|
|
||||||
= label_tag :search do
|
|
||||||
%strong Looking for
|
|
||||||
.input
|
|
||||||
= search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
|
|
||||||
= submit_tag 'Search', class: "btn btn-primary wide"
|
|
||||||
- if params[:search].present?
|
|
||||||
= render 'search/result'
|
|
|
@ -17,8 +17,6 @@
|
||||||
= link_to merge_requests_group_path(@group) do
|
= link_to merge_requests_group_path(@group) do
|
||||||
Merge Requests
|
Merge Requests
|
||||||
%span.count= current_user.cared_merge_requests.opened.of_group(@group).count
|
%span.count= current_user.cared_merge_requests.opened.of_group(@group).count
|
||||||
= nav_link(path: 'groups#search') do
|
|
||||||
= link_to "Search", search_group_path(@group)
|
|
||||||
= nav_link(path: 'groups#people') do
|
= nav_link(path: 'groups#people') do
|
||||||
= link_to "People", people_group_path(@group)
|
= link_to "People", people_group_path(@group)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue