summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-06-06 01:22:37 +0800
committerJoram Wilander <jwawilander@gmail.com>2017-06-05 13:22:37 -0400
commitdb1b202e421fd46a183a3fe8fdcf710e3d62a0a3 (patch)
tree177479b317ca9bef9cb73aad15057bfeb1ccabf2 /webapp
parentabd0466a42d6b9897ba9e3bcb373b41974e9c46f (diff)
downloadchat-db1b202e421fd46a183a3fe8fdcf710e3d62a0a3.tar.gz
chat-db1b202e421fd46a183a3fe8fdcf710e3d62a0a3.tar.bz2
chat-db1b202e421fd46a183a3fe8fdcf710e3d62a0a3.zip
fix regression for LDAP users not showing email address (#6568)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/user_settings/user_settings_general/user_settings_general.jsx20
1 files changed, 10 insertions, 10 deletions
diff --git a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
index 353a6d582..e265754d9 100644
--- a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
@@ -487,7 +487,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailGitlabCantUpdate'
defaultMessage='Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
</div>
@@ -505,7 +505,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailGoogleCantUpdate'
defaultMessage='Login occurs through Google Apps. Email cannot be updated. Email address used for notifications is {email}.'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
</div>
@@ -523,7 +523,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailOffice365CantUpdate'
defaultMessage='Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
</div>
@@ -541,7 +541,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailLdapCantUpdate'
defaultMessage='Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
</div>
@@ -558,7 +558,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.emailSamlCantUpdate'
defaultMessage='Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
</div>
@@ -617,7 +617,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginGitlab'
defaultMessage='Login done through GitLab ({email})'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
);
@@ -627,7 +627,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginGoogle'
defaultMessage='Login done through Google Apps ({email})'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
);
@@ -637,7 +637,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginOffice365'
defaultMessage='Login done through Office 365 ({email})'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
);
@@ -647,7 +647,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginLdap'
defaultMessage='Login done through AD/LDAP ({email})'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
);
@@ -657,7 +657,7 @@ class UserSettingsGeneralTab extends React.Component {
id='user.settings.general.loginSaml'
defaultMessage='Login done through SAML ({email})'
values={{
- email: this.state.email
+ email: this.state.originalEmail
}}
/>
);