From db1b202e421fd46a183a3fe8fdcf710e3d62a0a3 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 6 Jun 2017 01:22:37 +0800
Subject: fix regression for LDAP users not showing email address (#6568)

---
 .../user_settings_general/user_settings_general.jsx  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'webapp')

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
                         }}
                     />
                 );
-- 
cgit v1.2.3-1-g7c22