diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2017-05-13 02:12:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-13 02:12:14 +0300 |
commit | ca35a8a0814c24263094e116b95df650b70d09bb (patch) | |
tree | 869e1acb94c170cc6104e02bca18ab3b093b1158 /plugins/SitesManager | |
parent | 716752b01040da6fc3b2a9e396d8e5cee7e5663a (diff) |
Add possibility to ignore "no data recorded" screen for one hour (#11686)
* Add possibility to ignore "no data recorded" screen for one hour
* update screens
* update wording
Diffstat (limited to 'plugins/SitesManager')
-rw-r--r-- | plugins/SitesManager/Controller.php | 13 | ||||
-rw-r--r-- | plugins/SitesManager/SitesManager.php | 6 | ||||
-rw-r--r-- | plugins/SitesManager/lang/en.json | 3 | ||||
-rw-r--r-- | plugins/SitesManager/templates/siteWithoutData.twig | 5 |
4 files changed, 26 insertions, 1 deletions
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index b488c39d89..91744e84b2 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -13,6 +13,7 @@ use Piwik\API\ResponseBuilder; use Piwik\Common; use Piwik\Exception\UnexpectedWebsiteFoundException; use Piwik\Piwik; +use Piwik\Session; use Piwik\Settings\Measurable\MeasurableSettings; use Piwik\SettingsPiwik; use Piwik\Site; @@ -130,6 +131,18 @@ class Controller extends \Piwik\Plugin\ControllerAdmin return file_get_contents($path . $filename); } + public function ignoreNoDataMessage() + { + Piwik::checkUserHasSomeViewAccess(); + + $session = new Session\SessionNamespace('siteWithoutData'); + $session->ignoreMessage = true; + $session->setExpirationSeconds($oneHour = 60 * 60); + + $url = Url::getCurrentUrlWithoutQueryString() . Url::getCurrentQueryStringWithParametersModified(array('module' => 'CoreHome', 'action' => 'index')); + Url::redirectToUrl($url); + } + public function siteWithoutData() { $javascriptGenerator = new TrackerCodeGenerator(); diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 1154e2cc10..a588191901 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -17,6 +17,7 @@ use Piwik\Plugins\PrivacyManager\PrivacyManager; use Piwik\Settings\Storage\Backend\MeasurableSettingsTable; use Piwik\Tracker\Cache; use Piwik\Tracker\Model as TrackerModel; +use Piwik\Session\SessionNamespace; /** * @@ -69,6 +70,11 @@ class SitesManager extends \Piwik\Plugin $trackerModel = new TrackerModel(); if ($trackerModel->isSiteEmpty($siteId)) { + $session = new SessionNamespace('siteWithoutData'); + if (!empty($session->ignoreMessage)) { + return; + } + $module = 'SitesManager'; $action = 'siteWithoutData'; } diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 1375674e1c..c4925ed7f1 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -76,6 +76,7 @@ "SiteWithoutDataSetupTracking": "Please set up the %1$stracking code%2$s below into your website or mobile app if you haven't done already.", "SiteWithoutDataMessageDisappears": "This message will disappear as soon as some data was tracked for this website.", "SiteWithoutDataSetupGoals": "In the meantime, maybe you would like to %1$sset up some goals%2$s or learn more about the %3$sfeatures%4$s of Piwik in one of our %5$sguides%6$s or %7$sFAQs%8$s.", + "SiteWithoutDataIgnoreMessage": "Don't show this message for the next hour", "SuperUserAccessCan": "A user with Super User access can also %1$s specify global settings%2$s for new websites.", "Timezone": "Time zone", "TrackingSiteSearch": "Tracking Internal Site Search", @@ -92,4 +93,4 @@ "YouCurrentlyHaveAccessToNWebsites": "You currently have access to %s websites.", "YourCurrentIpAddressIs": "Your current IP address is %s" } -}
\ No newline at end of file +} diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig index bf0db36a39..a767fb3c04 100644 --- a/plugins/SitesManager/templates/siteWithoutData.twig +++ b/plugins/SitesManager/templates/siteWithoutData.twig @@ -45,6 +45,11 @@ '<a href="https://piwik.org/features/" rel="noreferrer" target="_blank">', "</a>", '<a href="https://piwik.org/docs/" rel="noreferrer" target="_blank">', "</a>", '<a href="https://piwik.org/faq/" rel="noreferrer" target="_blank">', "</a>")|raw }} + + <br /> + <br /> + <a href="{{ linkTo({module: 'SitesManager', action: 'ignoreNoDataMessage'}) }}" + class="btn ignoreSitesWithoutData">{{ 'SitesManager_SiteWithoutDataIgnoreMessage'|translate }}</a> </p> {{ trackingHelp|raw }} |