Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-07-12 11:30:35 +0300
committerGitHub <noreply@github.com>2017-07-12 11:30:35 +0300
commitc79bec8155e06515ea2c31d46b9683e03945bf81 (patch)
tree0a46e68a9efba9b45b1b04fc67399fe3babcbef1 /plugins
parent33a1a5666c8f65a9968e3ce47ec6d25ae1daa3e6 (diff)
Show confirmation before giving view access to anonymous user (#11744)
* Show confirmation before giving view access to anonymous user * Remove unneeded usage of raw template filter
Diffstat (limited to 'plugins')
-rw-r--r--plugins/UsersManager/angularjs/give-user-view-access/give-user-view-access.controller.js10
-rw-r--r--plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js15
-rw-r--r--plugins/UsersManager/lang/en.json1
-rw-r--r--plugins/UsersManager/templates/index.twig6
4 files changed, 25 insertions, 7 deletions
diff --git a/plugins/UsersManager/angularjs/give-user-view-access/give-user-view-access.controller.js b/plugins/UsersManager/angularjs/give-user-view-access/give-user-view-access.controller.js
index dd465557fa..fa2a01dcea 100644
--- a/plugins/UsersManager/angularjs/give-user-view-access/give-user-view-access.controller.js
+++ b/plugins/UsersManager/angularjs/give-user-view-access/give-user-view-access.controller.js
@@ -133,7 +133,15 @@
if (idSites === 'all') {
setViewAccessForUserToAllWebsitesIfUserConfirms(userLogin);
} else {
- setViewAccessForUserIfNotAlreadyHasAccess(userLogin, idSites);
+ function onValidate() {
+ setViewAccessForUserIfNotAlreadyHasAccess(userLogin, idSites);
+ }
+
+ if (userLogin == 'anonymous') {
+ piwikHelper.modalConfirm('#confirmAnonymousAccess', {yes: onValidate, no: hideLoading})
+ } else {
+ onValidate();
+ }
}
}
diff --git a/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js b/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
index 4a2a91b09f..96b34ae726 100644
--- a/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
+++ b/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
@@ -104,19 +104,22 @@
}
}
- if (this.site.id == 'all') {
+ function onValidate() {
+ launchAjaxRequest(login, access).then(successCallback);
+ }
+
+ if (login == 'anonymous' && access == 'view') {
+ piwikHelper.modalConfirm('#confirmAnonymousAccess', {yes: onValidate})
+ }
+ else if (this.site.id == 'all') {
//ask confirmation
$('#confirm').find('.login').text(login);
- function onValidate() {
- launchAjaxRequest(login, access).then(successCallback);
- }
-
piwikHelper.modalConfirm('#confirm', {yes: onValidate})
}
else {
- launchAjaxRequest(login, access).then(successCallback);
+ onValidate();
}
}
}
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 976cc83afd..8479238953 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -3,6 +3,7 @@
"AddUser": "Add a new user",
"Alias": "Alias",
"AllWebsites": "All websites",
+ "AnonymousAccessConfirmation": "You are about to grant the anonymous user the 'view' access to this website. This means your analytics reports and your visitors information will be publicly viewable by anyone even without a login. Are you sure you want to proceed?",
"AnonymousUser": "Anonymous user",
"AnonymousUserHasViewAccess": "Note: the %1$s user has %2$s access to this website.",
"AnonymousUserHasViewAccess2": "Your analytics reports and your visitors information are publicly viewable.",
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index cad99a0436..902b95e24d 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -162,6 +162,12 @@
<input role="no" type="button" value="{{ 'General_No'|translate }}"/>
</div>
+<div class="ui-confirm" id="confirmAnonymousAccess">
+ <h2>{{ 'UsersManager_AnonymousAccessConfirmation'|translate }}</h2>
+ <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
+ <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
+</div>
+
{% if userIsSuperUser %}
<div piwik-content-block content-title="{{ 'UsersManager_UsersManagement'|translate|e('html_attr') }}">
<div class="ui-confirm" id="confirmUserRemove">