diff options
author | Peter Zhang <peter@innocraft.com> | 2021-12-08 02:28:29 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 02:28:29 +0300 |
commit | 2da215c65d77fb273c7899fd23e65c67bc50c4f8 (patch) | |
tree | bea956ea33765459a7a610744953879a5c5a784e /plugins/CoreHome | |
parent | 4f5cda954a6b64677f9b48223a91e0ec8785e055 (diff) |
add disable archiving segment for plugins (#18279)
* add disable archiving segment for plugins
add disable archiving segment for plugins
* Update Rules.php
add isset check
* Update global.ini.php
update disable_archiving_segment_for_plugins to right place
* update tests
update tests
* Update global.ini.php
update wording
* update wording and test
update wording and test
* update tests
update tests
* Update UIIntegrationTest_admin_diagnostics_configfile.png
update config
* Update global.ini.php
update wording
* Update UIIntegrationTest_admin_diagnostics_configfile.png
update screen shot
* move general config to a file
move general config to a file
* update screenshot
update screenshot
* Update Rules.php
update rule
* Update global.ini.php
update global
* Update config/global.ini.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update core/ArchiveProcessor/Rules.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* update tests and case and special-characters
update tests and case and special-characters
* update tests
update tests
* Update UIIntegrationTest_admin_diagnostics_configfile.png
update config screenshot
* Update core/ArchiveProcessor/Rules.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update tests/PHPUnit/System/ArchiveInvalidationTest.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* add footer message for disable plugin
add footer message for disable plugin
* Update core/Plugin/Visualization.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* core/Plugin/Visualization.php
update en and check unsegmented reports
* Update en.json
update lang
* Update core/Config/GeneralConfig.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update plugins/CoreHome/lang/en.json
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* add screenshot tests
add screenshot tests
* Update DisablePluginArchive.php
set up site
* Update DisablePluginArchive.php
update config
* Update DisablePluginArchive.php
update to overwrite
* Create DisablePluginArchive_DisablePluginArchive.png
update screen shot
* update config
update config
* update screen
update screen
* update screenshots
update screenshots
* update unrelated screenshots and update tests
update unrelated screenshots and update tests
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r-- | plugins/CoreHome/CoreHome.php | 1 | ||||
-rw-r--r-- | plugins/CoreHome/lang/en.json | 1 | ||||
-rw-r--r-- | plugins/CoreHome/templates/_dataTable.twig | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index f7d11586b3..c234997b6f 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -464,5 +464,6 @@ class CoreHome extends \Piwik\Plugin $translationKeys[] = 'CoreHome_TechDeprecationWarning'; $translationKeys[] = 'CoreHome_StartDate'; $translationKeys[] = 'CoreHome_EndDate'; + $translationKeys[] = 'CoreHome_DataForThisReportHasBeenDisabled'; } } diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index 44416ef59f..e49bcf7889 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -11,6 +11,7 @@ "CloseWidgetDirections": "You can close this widget by clicking on the 'X' icon at the top of the widget.", "ChooseX": "Choose %1$s", "DataForThisReportHasBeenPurged": "The data for this report is more than %s months old and has been purged.", + "DataForThisReportHasBeenDisabled": "Segmentation is currently disabled for this report. Please check %1$sthis FAQ%2$s for more details.", "DataTableExcludeAggregateRows": "Aggregate rows are shown %s Hide them", "DataTableIncludeAggregateRows": "Aggregate rows are hidden %s Show them", "DataTableHowToSearch": "Press enter or click the search icon to search", diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig index d1a934c961..96dd9841dc 100644 --- a/plugins/CoreHome/templates/_dataTable.twig +++ b/plugins/CoreHome/templates/_dataTable.twig @@ -59,6 +59,8 @@ <div class="pk-emptyDataTable"> {% if showReportDataWasPurgedMessage is defined and showReportDataWasPurgedMessage %} {{ 'CoreHome_DataForThisReportHasBeenPurged'|translate(deleteReportsOlderThan) }} + {% elseif showPluginArchiveDisabled is defined and showPluginArchiveDisabled%} + {{ 'CoreHome_DataForThisReportHasBeenDisabled'|translate('<a target="_blank" href="'~'https://matomo.org/faq/how-to-disable-archiving-the-segment-reports-for-specific-plugins' ~'">', '</a>')|raw }} {% elseif properties.no_data_message %} {{ properties.no_data_message|raw }} {% else %} |