Commit f4f36f78ddb3d720ad7ae89ecea300c9f48775c7
1 parent
cc1dd624
Exists in
master
and in
4 other branches
Remove separate search page from group
Showing
3 changed files
with
0 additions
and
20 deletions
Show diff stats
app/controllers/groups_controller.rb
| @@ -59,15 +59,6 @@ class GroupsController < ApplicationController | @@ -59,15 +59,6 @@ class GroupsController < ApplicationController | ||
| 59 | end | 59 | end |
| 60 | end | 60 | end |
| 61 | 61 | ||
| 62 | - def search | ||
| 63 | - result = SearchContext.new(project_ids, params).execute | ||
| 64 | - | ||
| 65 | - @projects = result[:projects] | ||
| 66 | - @merge_requests = result[:merge_requests] | ||
| 67 | - @issues = result[:issues] | ||
| 68 | - @wiki_pages = result[:wiki_pages] | ||
| 69 | - end | ||
| 70 | - | ||
| 71 | def people | 62 | def people |
| 72 | @project = group.projects.find(params[:project_id]) if params[:project_id] | 63 | @project = group.projects.find(params[:project_id]) if params[:project_id] |
| 73 | @users = @project ? @project.users : group.users | 64 | @users = @project ? @project.users : group.users |
app/views/groups/search.html.haml
| @@ -1,9 +0,0 @@ | @@ -1,9 +0,0 @@ | ||
| 1 | -= form_tag search_group_path(@group), method: :get, class: 'form-inline' do |f| | ||
| 2 | - .padded | ||
| 3 | - = label_tag :search do | ||
| 4 | - %strong Looking for | ||
| 5 | - .input | ||
| 6 | - = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search" | ||
| 7 | - = submit_tag 'Search', class: "btn btn-primary wide" | ||
| 8 | -- if params[:search].present? | ||
| 9 | - = render 'search/result' |
app/views/layouts/group.html.haml
| @@ -17,8 +17,6 @@ | @@ -17,8 +17,6 @@ | ||
| 17 | = link_to merge_requests_group_path(@group) do | 17 | = link_to merge_requests_group_path(@group) do |
| 18 | Merge Requests | 18 | Merge Requests |
| 19 | %span.count= current_user.cared_merge_requests.opened.of_group(@group).count | 19 | %span.count= current_user.cared_merge_requests.opened.of_group(@group).count |
| 20 | - = nav_link(path: 'groups#search') do | ||
| 21 | - = link_to "Search", search_group_path(@group) | ||
| 22 | = nav_link(path: 'groups#people') do | 20 | = nav_link(path: 'groups#people') do |
| 23 | = link_to "People", people_group_path(@group) | 21 | = link_to "People", people_group_path(@group) |
| 24 | 22 |