diff options
14 files changed, 39 insertions, 29 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 374b4a4965..a15991e392 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -488,11 +488,10 @@ datatable_archiving_maximum_rows_subtable_referrers = 50 ; maximum number of rows for the Users report datatable_archiving_maximum_rows_userid_users = 50000 -; maximum number of rows for the Custom Variables names report -; Note: if the website is Ecommerce enabled, the two values below will be automatically set to 50000 -datatable_archiving_maximum_rows_custom_variables = 1000 -; maximum number of rows for the Custom Variables values reports -datatable_archiving_maximum_rows_subtable_custom_variables = 1000 +; maximum number of rows for the Custom Dimensions report +datatable_archiving_maximum_rows_custom_dimensions = 1000 +; maximum number of rows for the Custom Dimensions subtable reports +datatable_archiving_maximum_rows_subtable_custom_dimensions = 1000 ; maximum number of rows for any of the Actions tables (pages, downloads, outlinks) datatable_archiving_maximum_rows_actions = 500 diff --git a/core/Updates/4.0.0-b2.php b/core/Updates/4.0.0-b2.php index 4a6309ea08..d71e55a7a4 100644 --- a/core/Updates/4.0.0-b2.php +++ b/core/Updates/4.0.0-b2.php @@ -9,6 +9,7 @@ namespace Piwik\Updates; +use Piwik\Config; use Piwik\Plugin\Manager; use Piwik\Plugins\Installation\ServerFilesGenerator; use Piwik\Plugins\UserCountry\LocationProvider; @@ -56,6 +57,16 @@ class Updates_4_0_0_b2 extends PiwikUpdates $migrations[] = $this->migration->plugin->activate('CustomDimensions'); } + $configTableLimit = Config::getInstance()->getFromLocalConfig('General')['datatable_archiving_maximum_rows_custom_variables'] ?? null; + $configSubTableLimit = Config::getInstance()->getFromLocalConfig('General')['datatable_archiving_maximum_rows_subtable_custom_variables'] ?? null; + + if ($configTableLimit) { + $migrations[] = $this->migration->config->set('General', 'datatable_archiving_maximum_rows_custom_dimensions', $configTableLimit); + } + if ($configSubTableLimit) { + $migrations[] = $this->migration->config->set('General', 'datatable_archiving_maximum_rows_subtable_custom_dimensions', $configSubTableLimit); + } + return $migrations; } 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 diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index 248bda4ba9..83c628952d 100644 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -155,8 +155,8 @@ class BlobReportLimitingTest extends SystemTestCase $generalConfig['datatable_archiving_maximum_rows_actions'] = 500; $generalConfig['datatable_archiving_maximum_rows_subtable_actions'] = 500; $generalConfig['datatable_archiving_maximum_rows_standard'] = 500; - $generalConfig['datatable_archiving_maximum_rows_custom_variables'] = 500; - $generalConfig['datatable_archiving_maximum_rows_subtable_custom_variables'] = 500; + $generalConfig['datatable_archiving_maximum_rows_custom_dimensions'] = 500; + $generalConfig['datatable_archiving_maximum_rows_subtable_custom_dimensions'] = 500; $generalConfig['archiving_ranking_query_row_limit'] = 0; $generalConfig['datatable_archiving_maximum_rows_site_search'] = 500; $generalConfig['datatable_archiving_maximum_rows_userid_users'] = 500; @@ -184,8 +184,8 @@ class BlobReportLimitingTest extends SystemTestCase $generalConfig['datatable_archiving_maximum_rows_referers'] = 3; $generalConfig['datatable_archiving_maximum_rows_subtable_referers'] = 2; $generalConfig['datatable_archiving_maximum_rows_actions'] = 4; - $generalConfig['datatable_archiving_maximum_rows_custom_variables'] = 3; - $generalConfig['datatable_archiving_maximum_rows_subtable_custom_variables'] = 2; + $generalConfig['datatable_archiving_maximum_rows_custom_dimensions'] = 3; + $generalConfig['datatable_archiving_maximum_rows_subtable_custom_dimensions'] = 2; $generalConfig['datatable_archiving_maximum_rows_subtable_actions'] = 2; $generalConfig['datatable_archiving_maximum_rows_standard'] = 3; $generalConfig['datatable_archiving_maximum_rows_userid_users'] = 3; diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index f7cdf84a2b..7379d33aec 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc9ddb34a961a7dad774581da922e498e31932267b4c002b03e7f17f66a27105 -size 366974 +oid sha256:9ea4732baab08e8ddb93a561dcab5b7047af7d4de22fca395359f8d9946dbcde +size 366901 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 4ecf033444..3d71ee6fba 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5c9de8b9f393b3335ebe363593a879e7a3c761e11dd3be3e9491bb5b78d4ffd -size 728461 +oid sha256:6fc4aaaaa7c68c26d8b7f6af29d5b040187abee86563b573a3d4f3d080d47cd6 +size 728454 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 6664b3f9a2..dfae4a5e04 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:607f1da9e1260b15f7bd1bf1a176963fd499f0a309fada82567d7fe65e430ba4 -size 4326445 +oid sha256:ede1813eeb82cc042fc4f8244a8c2ce0210eba52b37a3c9de130e68067414b1a +size 4319181 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 415396c693..1c1e01bff8 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03a0d2b4c78a113f9d54f27fcd5fdf8839be1c2d9dbb0daa633c6bed5977bac4 -size 149530 +oid sha256:c4ee6d92d654a5855ba2d4ff82d66ea8f7d8eb31760c25701256ac9009c2fbad +size 149517 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png index 415396c693..1c1e01bff8 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03a0d2b4c78a113f9d54f27fcd5fdf8839be1c2d9dbb0daa633c6bed5977bac4 -size 149530 +oid sha256:c4ee6d92d654a5855ba2d4ff82d66ea8f7d8eb31760c25701256ac9009c2fbad +size 149517 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 469a636ef9..f8cc19cf09 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2643918aedaa43a0ba74e04a3f7aa05de391c7e00ab4fc4ddd1c5c1404f23195 -size 652916 +oid sha256:c9e1ffcb9d82201bab7d74af1880394d2c07543f17a002c3e45588d38fa95e4a +size 652933 |
