OSDN Git Service

Remove separate search page from group
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 14 Mar 2013 10:37:28 +0000 (12:37 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 14 Mar 2013 10:37:28 +0000 (12:37 +0200)
app/controllers/groups_controller.rb
app/views/groups/search.html.haml [deleted file]
app/views/layouts/group.html.haml

index cbb024b..bdf3567 100644 (file)
@@ -59,15 +59,6 @@ class GroupsController < ApplicationController
     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
     @project = group.projects.find(params[:project_id]) if params[:project_id]
     @users = @project ? @project.users : group.users
diff --git a/app/views/groups/search.html.haml b/app/views/groups/search.html.haml
deleted file mode 100644 (file)
index f56bbad..0000000
+++ /dev/null
@@ -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'
index 624d5ab..4552828 100644 (file)
@@ -17,8 +17,6 @@
           = link_to merge_requests_group_path(@group) do
             Merge Requests
             %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
           = link_to "People", people_group_path(@group)