summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-29 10:09:22 -0400
committerChristopher Speller <crspeller@gmail.com>2016-07-29 10:09:22 -0400
commit56fd348123dbe51653996d1dab6fcf6613b5a94d (patch)
tree4f913f1ecb2f24be679cb24ffa4e32b8b370fb4d /webapp
parent6f45bdd68b5a66f11893a151ae295ba1fb2c5cf5 (diff)
downloadchat-56fd348123dbe51653996d1dab6fcf6613b5a94d.tar.gz
chat-56fd348123dbe51653996d1dab6fcf6613b5a94d.tar.bz2
chat-56fd348123dbe51653996d1dab6fcf6613b5a94d.zip
PLT-3752 Changed email connection test to use the existing password if unchanged by client (#3685)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/email_connection_test.jsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/components/admin_console/email_connection_test.jsx b/webapp/components/admin_console/email_connection_test.jsx
index c66543bbf..7713f0960 100644
--- a/webapp/components/admin_console/email_connection_test.jsx
+++ b/webapp/components/admin_console/email_connection_test.jsx
@@ -46,9 +46,14 @@ export default class EmailConnectionTestButton extends React.Component {
});
},
(err) => {
+ let fail = err.message;
+ if (err.detailed_error) {
+ fail += ' - ' + err.detailed_error;
+ }
+
this.setState({
testing: false,
- fail: err.message + ' - ' + err.detailed_error
+ fail
});
}
);