Download as
Browse Code »

Commit 9d9b78823d151970fd784b995da2be1a5155b581

Authored by Dmitriy Zaporozhets
1 parent 46daf01a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix paginate of blobs, fixed preserve in dev mode for blob results

Showing 4 changed files with 6 additions and 12 deletions   Show diff stats
app/contexts/search_context.rb
  Diff comments   View file @9d9b788
@@ -17,14 +17,7 @@ class SearchContext @@ -17,14 +17,7 @@ class SearchContext
17 project = projects.first if projects.length == 1 17 project = projects.first if projects.length == 1
18 18
19 if params[:search_code].present? 19 if params[:search_code].present?
20 - blobs = []  
21 -  
22 - unless project.empty_repo?  
23 - blobs = project.repository.search_files(query, params[:repository_ref])  
24 - blobs = Kaminari.paginate_array(blobs).page(params[:page]).per(20)  
25 - end  
26 -  
27 - result[:blobs] = blobs 20 + result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
28 else 21 else
29 result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10) 22 result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)
30 result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10) 23 result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)
app/controllers/search_controller.rb
  Diff comments   View file @9d9b788
@@ -20,6 +20,7 @@ class SearchController < ApplicationController @@ -20,6 +20,7 @@ class SearchController < ApplicationController
20 @merge_requests = result[:merge_requests] 20 @merge_requests = result[:merge_requests]
21 @issues = result[:issues] 21 @issues = result[:issues]
22 @wiki_pages = result[:wiki_pages] 22 @wiki_pages = result[:wiki_pages]
23 - @blobs = result[:blobs] 23 + @blobs = Kaminari.paginate_array(result[:blobs]).page(params[:page]).per(20)
  24 + @total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count
24 end 25 end
25 end 26 end
app/views/search/_blob.html.haml
  Diff comments   View file @9d9b788
@@ -7,4 +7,5 @@ @@ -7,4 +7,5 @@
7 = blob.filename 7 = blob.filename
8 .file_content.code.term 8 .file_content.code.term
9 %div{class: user_color_scheme_class} 9 %div{class: user_color_scheme_class}
10 - = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) 10 + = preserve do
  11 + = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
app/views/search/_result.html.haml
  Diff comments   View file @9d9b788
1 %fieldset 1 %fieldset
2 %legend 2 %legend
3 Search results 3 Search results
4 - %span.cgray (#{@projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count}) 4 + %span.cgray (#{@total_results})
5 5
6 - if @project 6 - if @project
7 %ul.nav.nav-pills 7 %ul.nav.nav-pills
@@ -12,7 +12,6 @@ @@ -12,7 +12,6 @@
12 = link_to search_path(params.merge(search_code: nil)) do 12 = link_to search_path(params.merge(search_code: nil)) do
13 Everything else 13 Everything else
14 14
15 -  
16 .search_results 15 .search_results
17 %ul.bordered-list 16 %ul.bordered-list
18 - @projects.each do |project| 17 - @projects.each do |project|