From 0ca08849370807656546932f6632af431fef6a5e Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Tue, 15 May 2018 17:48:48 +0200
Subject: [PATCH] Fix pagination in global search inside repositories
 [SCI-2411]

---
 app/controllers/search_controller.rb            | 11 ++++++++++-
 app/views/search/index.html.erb                 | 16 +++++++++++++---
 app/views/search/results/_repositories.html.erb |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 2e346334a..ef6de18c1 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -154,6 +154,15 @@ class SearchController < ApplicationController
     count_total
   end
 
+  def current_repository_search_count
+    @repository_search_count.each_value do |counter|
+      res = counter[:repositories].values.detect do |rep|
+        rep[:id] == @repository.id
+      end
+      return res[:count]
+    end
+  end
+
   def count_search_results
     @project_search_count = fetch_cached_count Project
     @experiment_search_count = fetch_cached_count Experiment
@@ -265,7 +274,7 @@ class SearchController < ApplicationController
                           whole_word: @search_whole_word,
                           whole_phrase: @search_whole_phrase)
     end
-    @search_count = @repository_search_count_total
+    @search_count = current_repository_search_count
   end
 
   def search_assets
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 5c4c1cced..9d7a21ef1 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -298,23 +298,33 @@
   <% end %>
 
   <% if @search_pages > 1 %>
+  <% params = { q: @search_query,
+                category: @search_category,
+                utf8: '✓',
+                search_id: @search_id } %>
+  <% if @search_category == :repositories %>
+    <% params[:repository] = @repository.id %>
+  <% end %>
   <nav class="text-center">
     <ul class="pagination">
       <% if @search_page > 1 %>
+      <% params[:page] = @search_page - 1 %>
       <li>
-        <a href="?<%= {q: @search_query, category: @search_category, page: @search_page - 1, utf8: '✓'}.to_query %>" aria-label="Previous">
+        <a href="?<%= params.to_query %>" aria-label="Previous">
           <span aria-hidden="true">&laquo;</span>
         </a>
       </li>
       <% end %>
       <% (@start_page..@end_page).each do |page_i| %>
+      <% params[:page] = page_i %>
       <li <% if @search_page == page_i %>class="active"<% end %>>
-        <a href="?<%= {q: @search_query, category: @search_category, page: page_i, utf8: '✓'}.to_query %>"><%= page_i %></a>
+        <a href="?<%= params.to_query %>"><%= page_i %></a>
       </li>
       <% end %>
       <% if @search_page < @search_pages %>
+      <% params[:page] = @search_page + 1 %>
       <li>
-        <a href="?<%= {q: @search_query, category: @search_category, page: @search_page + 1, utf8: '✓'}.to_query %>" aria-label="Previous">
+        <a href="?<%= params.to_query %>" aria-label="Next">
           <span aria-hidden="true">&raquo;</span>
         </a>
       </li>
diff --git a/app/views/search/results/_repositories.html.erb b/app/views/search/results/_repositories.html.erb
index 550bcc5a9..96ff4032f 100644
--- a/app/views/search/results/_repositories.html.erb
+++ b/app/views/search/results/_repositories.html.erb
@@ -20,6 +20,7 @@
       <%=t "search.index.repositories.added_by" %>
       <%= highlight repository_row.created_by.full_name, search_query.strip.split(/\s+/) %>
     </span>
+    <br>
     <% repository_row.repository_cells.each do |cell| %>
       <span>
         <%=t "search.index.repositories.custom_column", column: cell.repository_column.name %>