blog paginate -> pagy (publiclab#8446)

reginaalyssa · Oct 16, 2021 · 40380ff · 40380ff
1 parent 6786bd2
commit 40380ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/tag_controller.rb b/app/controllers/tag_controller.rb
@@ -253,9 +253,7 @@ def widget
 
   def blog
     nids = Tag.find_nodes_by_type(params[:id], 'note', nil).collect(&:nid)
-    @notes = Node.paginate(page: params[:page], per_page: 6)
-      .where('status = 1 AND nid in (?)', nids)
-      .order('created DESC')
+    @pagy, @notes = pagy(Node.where('status = 1 AND nid in (?)', nids).order('created DESC'), items: 6)
     @tags = Tag.where(name: params[:id])
     @tagnames = @tags.collect(&:name).uniq! || []
     @title = @tagnames.join(',') + ' Blog' if @tagnames

diff --git a/app/views/tag/blog.html.erb b/app/views/tag/blog.html.erb
@@ -79,7 +79,11 @@
       <% end %>
 
     <div class="text-center">
+      <% if @pagy %>
+        <%== pagy_bootstrap_nav @pagy %>
+      <% else %>
         <%= will_paginate @notes, renderer: WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated %>
+      <% end %>
     </div>
 
   <% end %>