Skip to content

Commit

Permalink
Remove alias from user settings. (matomo-org#13543)
Browse files Browse the repository at this point in the history
* Remove alias from user settings.

* Update UI test screenshot.
  • Loading branch information
diosmosis authored and InfinityVoid committed Oct 11, 2018
1 parent 4ccd8b1 commit 82dde8f
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 13 deletions.
3 changes: 0 additions & 3 deletions plugins/UsersManager/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ public function userSettings()

$userLogin = Piwik::getCurrentUserLogin();
$user = Request::processRequest('UsersManager.getUser', array('userLogin' => $userLogin));
$view->userAlias = $user['alias'];
$view->userEmail = $user['email'];
$view->userTokenAuth = Piwik::getCurrentUserTokenAuth();

Expand Down Expand Up @@ -414,7 +413,6 @@ private function noAdminAccessToWebsite($idSiteSelected, $defaultReportSiteName,

private function processPasswordChange($userLogin)
{
$alias = Common::getRequestVar('alias');
$email = Common::getRequestVar('email');
$newPassword = false;

Expand All @@ -440,7 +438,6 @@ private function processPasswordChange($userLogin)
'userLogin' => $userLogin,
'password' => $newPassword,
'email' => $email,
'alias' => $alias,
], $default = []);

if ($newPassword !== false) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions plugins/UsersManager/templates/userSettings.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 82dde8f

Please sign in to comment.