From 04a71f18cae25c2f72c912ce72f5e1c38e86be79 Mon Sep 17 00:00:00 2001
From: joeuhren <46763106+joeuhren@users.noreply.github.com>
Date: Fri, 20 Nov 2020 18:18:36 -0700
Subject: [PATCH] Add two more settings to pick default dataTables entries per
 page

---
 app.js                             | 1 +
 lib/settings.js                    | 4 +++-
 settings.json.template             | 4 +++-
 views/includes/address_history.pug | 5 +++--
 views/index.pug                    | 5 +++--
 views/movement.pug                 | 5 +++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index fad2ba0..e4a8640 100644
--- a/app.js
+++ b/app.js
@@ -274,6 +274,7 @@ app.set('index', settings.index);
 app.set('heavy', settings.heavy);
 app.set('lock_during_index', settings.lock_during_index);
 app.set('txcount', settings.txcount);
+app.set('txcount_per_page', settings.txcount_per_page);
 app.set('nethash', settings.nethash);
 app.set('nethash_units', settings.nethash_units);
 app.set('show_sent_received', settings.show_sent_received);
diff --git a/lib/settings.js b/lib/settings.js
index 08b9d94..af27a9b 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -116,7 +116,8 @@ exports.movement = {
 exports.index = {
   "show_hashrate": false,
   "difficulty": "POS",
-  "last_txs": 100
+  "last_txs": 100,
+  "txs_per_page": 10
 };
 
 // twitter, facebook, googleplus, bitcointalk, github, slack, discord, telegram, reddit, youtube, website
@@ -145,6 +146,7 @@ exports.genesis_block = "0000860fcf946b44df0e7d85d6757d45f8de6f4c9aacc5c7b6abc13
 exports.heavy = false;
 exports.lock_during_index = false;
 exports.txcount = 100;
+exports.txcount_per_page = 50;
 exports.show_sent_received = true;
 exports.supply = "TXOUTSET";
 exports.nethash = "getnetworkhashps";
diff --git a/settings.json.template b/settings.json.template
index 83fa8e1..39b2e7b 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -95,7 +95,8 @@
   "index": {
     "show_hashrate": true,
     "difficulty": "POS",
-    "last_txs": 100
+    "last_txs": 100,
+    "txs_per_page": 10
   },
 
   // ensure links on API page are valid
@@ -158,6 +159,7 @@
 
   //amount of txs to index per address (stores latest n txs)
   "txcount": 100,
+  "txcount_per_page": 50,
 
   //show total sent & received on address page (set false if PoS)
   "show_sent_received": true,
diff --git a/views/includes/address_history.pug b/views/includes/address_history.pug
index 0a9c04a..f95b2ea 100644
--- a/views/includes/address_history.pug
+++ b/views/includes/address_history.pug
@@ -1,6 +1,7 @@
 script.
   var hashAddress = "#{address.a_id}";
   var setting_maxTxCount = parseInt("#{settings.txcount}");
+  var setting_txPerPage = parseInt("#{settings.txcount_per_page}");
   var lengthMenuOpts = [];
   var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
   for (i=0; i < lengthMenuOptsAdd.length; i++) {
@@ -8,10 +9,10 @@ script.
       lengthMenuOpts.push(lengthMenuOptsAdd[i]);
     }
   }
-  if (setting_maxTxCount < 50) {
+  if (setting_maxTxCount < setting_txPerPage) {
     var displayLengthMax = setting_maxTxCount;
   } else {
-    var displayLengthMax = 50;
+    var displayLengthMax = setting_txPerPage;
   }
 
   $(document).ready(function () {
diff --git a/views/index.pug b/views/index.pug
index 5f222fa..7260a29 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -3,6 +3,7 @@ extends layout
 block content
   script.
     var setting_maxTxCount = parseInt("#{settings.index.last_txs}");
+    var setting_txPerPage = parseInt("#{settings.index.txs_per_page}");
     var lengthMenuOpts = [];
     var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
     for (i=0; i < lengthMenuOptsAdd.length; i++) {
@@ -10,10 +11,10 @@ block content
         lengthMenuOpts.push(lengthMenuOptsAdd[i]);
       }
     }
-    if (setting_maxTxCount < 10) {
+    if (setting_maxTxCount < setting_txPerPage) {
       var displayLengthMax = setting_maxTxCount;
     } else {
-      var displayLengthMax = 10;
+      var displayLengthMax = setting_txPerPage;
     }
     $(document).ready(function(){
       var stable = $('#block-table').dataTable({
diff --git a/views/movement.pug b/views/movement.pug
index fa07bab..8217d1d 100644
--- a/views/movement.pug
+++ b/views/movement.pug
@@ -3,6 +3,7 @@ extends layout
 block content
   script.
     var setting_maxTxCount = parseInt("#{settings.index.last_txs}");
+    var setting_txPerPage = parseInt("#{settings.index.txs_per_page}");
     var lengthMenuOpts = [];
     var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
     for (i=0; i < lengthMenuOptsAdd.length; i++) {
@@ -10,10 +11,10 @@ block content
         lengthMenuOpts.push(lengthMenuOptsAdd[i]);
       }
     }
-    if (setting_maxTxCount < 10) {
+    if (setting_maxTxCount < setting_txPerPage) {
       var displayLengthMax = setting_maxTxCount;
     } else {
-      var displayLengthMax = 10;
+      var displayLengthMax = setting_txPerPage;
     }
     var rplot;
     var colors = [ "#0071bc" ];