diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-05-29 23:47:03 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-05-29 23:47:03 +0300 |
| commit | a36f26979a7e104d05b5b6310c0315b18ed5eb5f (patch) | |
| tree | e8de3bc174535cbe78621ea166736bbd8fc111f6 /plugins/PrivacyManager | |
| parent | 454f38cd6d79353d83c5efee8708c3abf204234c (diff) | |
Added feature to optionally disable Schedule old data deletion feature (#13004)
* Added feature to optionally disable Schedule old data deletion feature
* Update screenshot
Diffstat (limited to 'plugins/PrivacyManager')
| -rw-r--r-- | plugins/PrivacyManager/PrivacyManager.php | 2 | ||||
| -rw-r--r-- | plugins/PrivacyManager/templates/privacySettings.twig | 2 | ||||
| -rw-r--r-- | plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php | 1 |
3 files changed, 4 insertions, 1 deletions
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, |