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:
authorJustin Velluppillai <justin@innocraft.com>2021-06-25 06:49:52 +0300
committerGitHub <noreply@github.com>2021-06-25 06:49:52 +0300
commit438f518d327b423bdb61d7539a9786d94d640586 (patch)
tree1a8d72aac85d75c1cb3323708c4d6a53d5de69f4
parentf7abdd9c1fdd818a8c54b36ba807e1c9f5d14e16 (diff)
Allow changing row limit when hierarchy is expanded (#17704)
* Allow changing row limit when hierarchy is expanded * Updated failed UI tests where we now show row limit
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png4
-rw-r--r--plugins/CoreHome/javascripts/dataTable.js2
-rw-r--r--plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png4
4 files changed, 6 insertions, 8 deletions
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
index 7db5eb208b..2f5974dd40 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2e38da5d1365c597e7497a6d522a22d3d3e6bf31d7016eacb66bd0fff8cecdb9
-size 388498
+oid sha256:4a2e33653941467df83ccc1b7c5169b3b5c2cd6dd2fed001fc6856e95486d45f
+size 389213
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
index 04dec433c6..c901e9734d 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9f2fc492ab960096eaa016b62099c9b1a00b5482f2b6e1530d8cc87e689b61d7
-size 378669
+oid sha256:b79b18faee2bc3ee3a43452b38b9eba5c92e535d88b11d0c13a6ac8bc17ff6ac
+size 379373
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 76d85feb76..61ee596901 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -621,8 +621,6 @@ $.extend(DataTable.prototype, UIControl.prototype, {
var self = this;
if (typeof self.parentId != "undefined" && self.parentId != '') {
- // no limit selector for subtables
- $('.limitSelection', domElem).remove();
return;
}
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png
index 6c74b13cfe..4c941c1929 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:42e837a574702c59c838c083de8a4083f21ca43f3db16a551358720019efd4d1
-size 34732
+oid sha256:9058a4edc52e3e5a8a598758e0f945d460747a5a6322036eb60eb0e216d326a9
+size 35306