diff options
5 files changed, 7 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index ffae4bf675..cd457dc792 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -819,6 +819,7 @@ delete_logs_schedule_lowest_interval = 7 delete_logs_older_than = 180 delete_logs_max_rows_per_query = 100000 enable_auto_database_size_estimate = 1 +enable_database_size_estimate = 1 [Deletereports] delete_reports_enable = 0 diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index 56f5b1d626..8eab5017b0 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -24,7 +24,6 @@ use Piwik\Piwik; use Piwik\Plugin; use Piwik\Plugins\Goals\Archiver; use Piwik\Plugins\Installation\FormDefaultSettings; -use Piwik\Plugins\PrivacyManager\Tracker\RequestProcessor; use Piwik\Site; use Piwik\Tracker\GoalManager; @@ -51,6 +50,7 @@ class PrivacyManager extends Plugin 'delete_logs_older_than' => 'Deletelogs', 'delete_logs_max_rows_per_query' => 'Deletelogs', 'enable_auto_database_size_estimate' => 'Deletelogs', + 'enable_database_size_estimate' => 'Deletelogs', 'delete_reports_enable' => 'Deletereports', 'delete_reports_older_than' => 'Deletereports', 'delete_reports_keep_basic_metrics' => 'Deletereports', diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 0ffc8e479a..0d2d7fb1b0 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -262,6 +262,7 @@ </div> </div> + {% if deleteData.config.enable_database_size_estimate == '1' %} <div id="deleteDataEstimateSect" class="form-group row"> <h3 class="col s12" id="databaseSizeHeadline"> @@ -283,6 +284,7 @@ {% endif %} </div> </div> + {% endif %} <div piwik-save-button onconfirm="reportDeletionSchedule.save()" saving="reportDeletionSchedule.isLoading"></div> diff --git a/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php index 7a72882c24..cccb2c96e1 100644 --- a/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php +++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php @@ -150,6 +150,7 @@ class PrivacyManagerTest extends IntegrationTestCase 'delete_logs_older_than' => 180, 'delete_logs_max_rows_per_query' => 100000, 'enable_auto_database_size_estimate' => 1, + 'enable_database_size_estimate' => 1, 'delete_reports_enable' => 0, 'delete_reports_older_than' => 12, 'delete_reports_keep_basic_metrics' => 1, diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 043a0eaaf2..7c1f4b453d 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:03fde64cb843fdcbe586b8dde254bc41f1b51cc5555ad56d7ebbaf93dccc9154 -size 3925751 +oid sha256:06acc940692e711cdd42cf109d69f080870ac9c9d3c7d7db0bbe779c8d41595f +size 3930148 |
