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@matomo.org>2020-07-24 12:07:46 +0300
committerGitHub <noreply@github.com>2020-07-24 12:07:46 +0300
commit6b5f8138180716d5088d764f0b41d5787159b28a (patch)
tree358c2c2535fb83fdebf3815556797b38cc42e8b1 /plugins
parent817c48d66f456de83afbbe60c3996dabf99fb605 (diff)
Rename config setting for maximum rows in custom dimension reports (#16229)
* Rename config setting for maximum rows in custom dimension reports * automatically set new config values if old ones were set * submodule update * update expected UI files
Diffstat (limited to 'plugins')
-rw-r--r--plugins/CustomDimensions/Archiver.php4
m---------plugins/CustomVariables0
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png4
5 files changed, 8 insertions, 8 deletions
diff --git a/plugins/CustomDimensions/Archiver.php b/plugins/CustomDimensions/Archiver.php
index 1eb35dccfe..643b8f8cb7 100644
--- a/plugins/CustomDimensions/Archiver.php
+++ b/plugins/CustomDimensions/Archiver.php
@@ -42,8 +42,8 @@ class Archiver extends \Piwik\Plugin\Archiver
$this->processor = $processor;
- $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_custom_variables'];
- $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_custom_variables'];
+ $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_custom_dimensions'];
+ $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_custom_dimensions'];
}
public static function buildRecordNameForCustomDimensionId($id)
diff --git a/plugins/CustomVariables b/plugins/CustomVariables
-Subproject 5bce75189ad65fa06b517d93b061522585801c6
+Subproject 26b5f6d98bf3a89e5ed11f40c94eee8491d6b08
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index 55fbd12cbc..566204d45a 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3cb2e0430c211e6268faa26c3a705986b12477cf93757d56a335e7bfce93db1c
-size 472833
+oid sha256:1a336faac29a15e6aa380072d2557bd8675a240b02592460cc92e7d070a35858
+size 472823
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index ef377a0227..6661233f6c 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d8be503da3b294ceff6b9e4052e7facd13e664fd19771cbb00ddbf2607f495ef
-size 732871
+oid sha256:d4f8f6adc0e6ace78963ac956c227bd8ea98b5fc27ed8482722a1b2fbb006f7e
+size 732875
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
index ef377a0227..6661233f6c 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d8be503da3b294ceff6b9e4052e7facd13e664fd19771cbb00ddbf2607f495ef
-size 732871
+oid sha256:d4f8f6adc0e6ace78963ac956c227bd8ea98b5fc27ed8482722a1b2fbb006f7e
+size 732875