From d70efef8b13bdba3e39ab710f4a48b36c1778f12 Mon Sep 17 00:00:00 2001
From: Gaurav Singh <gauravsingh2699@rediffmail.com>
Date: Tue, 23 Mar 2021 20:32:16 +0530
Subject: [PATCH] Fixed Pagination issue (#9330)

* Added translations in users/settings.html.erb

* Fixed pagination issue

* fixed pagination issue

* Fixed pagination in wiki/stale too

* Delete identifier.sqlite

* fixed a minor issue

* Fixed minor issue

* Delete identifier.sqlite

* Added functional test to check pagination

* reduced no of new wikis for test

* reduced 31 to 12

Co-authored-by: Cess <cessmbuguar@gmail.com>
---
 app/controllers/wiki_controller.rb      |  4 ++--
 test/functional/wiki_controller_test.rb | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 03042af542..22135aeedb 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -341,7 +341,7 @@ def index
       .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'"))
+      .where("node_revisions.status = 1 AND node.status = 1 AND type = 'page'"), items: 10)
 
     @paginated = true
   end
@@ -353,7 +353,7 @@ def stale
       .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'"))
+      .where("node_revisions.status = 1 AND node.status = 1 AND type = 'page'"), items: 10)
 
     @paginated = true
     render template: 'wiki/index'
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 99bd6bd2a7..026a0f0842 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -31,11 +31,28 @@ def teardown
     assert assigns(:wikis).each_cons(2).all?{|i,j| "j.node_revisions.title" >= "i.node_revisions.title" }
   end
 
+  test 'should paginate the wikis' do
+    12.times{
+    post :create,
+         params: {
+           uid:   users(:bob).id,
+           title: 'Test',
+           body:  'This is fascinating documentation about balloon mapping.',
+           tags:  'balloon-mapping'
+         }
+    }
+    get :index
+    wikis = assigns(:wikis)
+    assert wikis.size==10
+  end
+
   test 'should sort by last edited' do
     get :index, params: { sort: "last_edited" }
     wikis = assigns(:wikis)
-    assert_equal(wikis.first.title,"Important work")
-    assert_equal(wikis.last.title,"Method page")
+    wiki1 = wikis.order(changed: :desc).first
+    wiki2 = wikis.order(changed: :desc).reverse.first
+    assert_equal(wikis.first.title, wiki1.title)
+    assert_equal(wikis.last.title, wiki2.title)
   end
 
   test 'should get wiki stale pages' do