diff options
| author | Justin Velluppillai <justin@innocraft.com> | 2021-06-27 23:41:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 23:41:12 +0300 |
| commit | 89abb4b2e5701cc0676da03467d3d7b1c84901ec (patch) | |
| tree | 594d08d633e61a7e650ba0dc9c44947a9d920b4d /plugins | |
| parent | ce3e9f996f29219f3f703768400036ac40ca0107 (diff) | |
Add info about custom segments in archiving setting (#17698)
* UI improvement - improve message to indicate that turning off browser triggered archiving will not prevent processing of archives when Custom Segments are used, if config browser_archiving_disabled_enforce=0
* Fix UI Test failure introduced by changing archiving settings info text
* Use existing Rules function instead of accessing config directly
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreAdminHome/Controller.php | 1 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/templates/generalSettings.twig | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index caa70012b1..ace47f5123 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -299,6 +299,7 @@ class Controller extends ControllerAdmin $view->todayArchiveTimeToLive = $todayArchiveTimeToLive; $view->todayArchiveTimeToLiveDefault = Rules::getTodayArchiveTimeToLiveDefault(); $view->enableBrowserTriggerArchiving = $enableBrowserTriggerArchiving; + $view->showSegmentArchiveTriggerInfo = Rules::isBrowserArchivingAvailableForSegments(); $mail = Config::getInstance()->mail; $mail['noreply_email_address'] = Config::getInstance()->General['noreply_email_address']; diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index f070cc97f1..e2a837c74b 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -33,7 +33,10 @@ name="enableBrowserTriggerArchiving" {% if enableBrowserTriggerArchiving==0 %} checked="checked"{% endif %} /> <span>{{ 'General_No'|translate }}</span> - <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/setup-auto-archiving/'>","</a>")|raw }}</span> + <span class="form-description"> + {{ 'General_ArchivingTriggerDescription'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/setup-auto-archiving/'>","</a>")|raw }} + {% if showSegmentArchiveTriggerInfo %}{{ 'General_ArchivingTriggerSegment'|translate }}{% endif %} + </span> </label> </p> </div><div class="col s12 m6"> |