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:
authordiosmosis <diosmosis@users.noreply.github.com>2018-10-05 06:25:06 +0300
committerGitHub <noreply@github.com>2018-10-05 06:25:06 +0300
commit8977a9222114eb5b5e6f0de664820cb165407822 (patch)
treeeb545d3c1ed5627c526fb9d14815a954cb13a0c1 /plugins/UsersManager
parent9544e8af2a970944470d6153f0ff09d5bc30d4cd (diff)
Remove alias from user settings. (#13543)
* Remove alias from user settings. * Update UI test screenshot.
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/Controller.php3
-rw-r--r--plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js1
-rw-r--r--plugins/UsersManager/templates/userSettings.twig7
3 files changed, 0 insertions, 11 deletions
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 50a723c440..ba35641075 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -172,7 +172,6 @@ class Controller extends ControllerAdmin
$userLogin = Piwik::getCurrentUserLogin();
$user = Request::processRequest('UsersManager.getUser', array('userLogin' => $userLogin));
- $view->userAlias = $user['alias'];
$view->userEmail = $user['email'];
$view->userTokenAuth = Piwik::getCurrentUserTokenAuth();
@@ -414,7 +413,6 @@ class Controller extends ControllerAdmin
private function processPasswordChange($userLogin)
{
- $alias = Common::getRequestVar('alias');
$email = Common::getRequestVar('email');
$newPassword = false;
@@ -440,7 +438,6 @@ class Controller extends ControllerAdmin
'userLogin' => $userLogin,
'password' => $newPassword,
'email' => $email,
- 'alias' => $alias,
], $default = []);
if ($newPassword !== false) {
diff --git a/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js b/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js
index 64ab12530d..b6f4b42c6e 100644
--- a/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js
+++ b/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js
@@ -57,7 +57,6 @@
this.save = function () {
var postParams = {
- alias: this.alias,
email: this.email,
defaultReport: this.defaultReport == 'MultiSites' ? this.defaultReport : this.site.id,
defaultDate: this.defaultDate,
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 885d1e9750..5ad0ffeee3 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -20,13 +20,6 @@
inline-help="{{ 'UsersManager_YourUsernameCannotBeChanged'|translate|e('html_attr') }}">
</div>
- <div piwik-field uicontrol="text" name="alias"
- ng-model="personalSettings.alias"
- maxlength="45"
- title="{{ 'UsersManager_Alias'|translate|e('html_attr') }}"
- value="{{ userAlias|raw }}">
- </div>
-
<div piwik-field uicontrol="text" name="email"
ng-model="personalSettings.email"
maxlength="100"