Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2016-04-19 03:17:12 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2016-04-19 03:17:12 +0300
commit7119a07d7e5bc6416c2f8eeb0823bbea5f840d18 (patch)
tree38987fd0677cafdfc5a0e4bfbada0513c109bae2
parent615d87477048bee3df0d2d1ef5bbbd79bf4b76f3 (diff)
Fix pagination in datatables when displaying all entries (#10063)2.16.2-b1
-rw-r--r--plugins/CoreHome/javascripts/dataTable.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 3a19e6dc86..ab8259231c 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -711,7 +711,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
if (self.param.keep_summary_row == 1) --totalRows;
- if (offsetEnd > totalRows) offsetEndDisp = totalRows;
+ if (offsetEnd > totalRows || Number(self.param.filter_limit) == -1) offsetEndDisp = totalRows;
// only show this string if there is some rows in the datatable
if (totalRows != 0) {
@@ -731,7 +731,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
+ Number(self.param.filter_limit);
var totalRows = Number(self.param.totalRows);
if (self.param.keep_summary_row == 1) --totalRows;
- if (offsetEnd < totalRows) {
+ if (offsetEnd < totalRows && Number(self.param.filter_limit) != -1) {
$(this).css('display', 'inline');
}
});