OSDN Git Service

Merge pull request #5435 from karlhungus/feature_search_namespace_name_and_public
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 31 Oct 2013 17:57:51 +0000 (10:57 -0700)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 31 Oct 2013 17:57:51 +0000 (10:57 -0700)
Allow searching by namespace name, include public projects

1  2 
app/contexts/search_context.rb

@@@ -7,14 -7,16 +7,17 @@@ class SearchContex
  
    def execute
      query = params[:search]
 +    query = Shellwords.shellescape(query) if query.present?
  
      return result unless query.present?
-     projects = Project.where(id: project_ids)
-     result[:projects] = projects.search(query).limit(20)
+     result[:projects] = Project.where("projects.id in (?) OR projects.public = true", project_ids).search(query).limit(20)
  
      # Search inside single project
+     single_project_search(Project.where(id: project_ids), query)
+     result
+   end
+   def single_project_search(projects, query)
      project = projects.first if projects.length == 1
  
      if params[:search_code].present?