add pagy for all wiki routes

publiclab · Sep 24, 2020 · a43f823 · a43f823
1 parent e4a0bbf
commit a43f823
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,5 @@
 include ActionView::Helpers::DateHelper # required for time_ago_in_words()
+include Pagy::Backend
 class ApplicationController < ActionController::Base
   protect_from_forgery unless: -> { is_dataurl_post }
   layout 'application'

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
@@ -277,7 +277,7 @@ def revisions
     @node = Node.find_wiki(params[:id])
     if @node
       @revisions = @node.revisions
-      @revisions = @revisions.where(status: 1).page(params[:page]).per_page(20) unless current_user&.can_moderate?
+      @pagy_revisions, @revisions = pagy(@revisions.where(status: 1), items: 20) unless current_user&.can_moderate?
       @title = I18n.t('wiki_controller.revisions_for', title: @node.title).html_safe
       @tags = @node.tags
       @paginated = true unless current_user&.can_moderate?
@@ -333,25 +333,23 @@ def index
       order_string = 'cached_likes DESC'
     end
 
-    @wikis = Node.includes(:revision)
+    @pagy, @wikis = pagy(Node.includes(:revision)
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order(order_string)
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')")
-      .page(params[:page])
+      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"))
 
     @paginated = true
   end
 
   def stale
     @title = I18n.t('wiki_controller.wiki')
 
-    @wikis = Node.includes(:revision)
+    @pagy, @wikis = pagy(Node.includes(:revision)
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order('node_revisions.timestamp ASC')
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')")
-      .page(params[:page])
+      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"))
 
     @paginated = true
     render template: 'wiki/index'
@@ -492,9 +490,9 @@ def update_node_attributes
   def author
     @user = User.find_by(name: params[:id])
     @title = @user.name
-    @wikis = Node.paginate(page: params[:page], per_page: 24)
+    @pagy, @wikis = pagy(Node
       .order('nid DESC')
-      .where("uid = ? AND type = 'page' OR type = 'place' OR type = 'tool' AND status = 1", @user.uid)
+      .where("uid = ? AND type = 'page' OR type = 'place' OR type = 'tool' AND status = 1", @user.uid), items: 24)
     render template: 'wiki/index'
   end
 end
diff --git a/app/views/wiki/revisions.html.erb b/app/views/wiki/revisions.html.erb
@@ -44,7 +44,11 @@
     </table>
 
    <hr />
+   <% if @pagy_revisions %>
+   <%= raw pagy_bootstrap_nav(@pagy_revisions) if @paginated %>
+   <% else %>
    <%= will_paginate @revisions, renderer: WillPaginate::ActionView::BootstrapLinkRenderer if @paginated %>
+   <% end %>
 </div>
   <div class="col-lg-7">
     <div class="btn-group float-right">

diff --git a/test/system/screenshots_test.rb b/test/system/screenshots_test.rb
@@ -172,7 +172,7 @@ class ScreenshotsTest < ApplicationSystemTestCase
 
   test 'wiki revisions' do
     visit "/wiki/revisions/#{nodes(:about).slug}"
-    click_on '1'
+    click_on '2'
     take_screenshot
   end