From 1f5c8c4e4ebb2e163278f3e62d640f41a2df7294 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Fri, 11 Mar 2016 00:14:55 -0300 Subject: Option to enable full snippets in push notifications --- webapp/components/admin_console/email_settings.jsx | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'webapp/components/admin_console') diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index 1decdae91..e591b636d 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -58,6 +58,14 @@ var holders = defineMessages({ id: 'admin.email.pushServerEx', defaultMessage: 'E.g.: "http://push-test.mattermost.com"' }, + genericPush: { + id: 'admin.email.genericPushNotification', + defaultMessage: 'Send generic description with user and channel names' + }, + fullPush: { + id: 'admin.email.fullPushNotification', + defaultMessage: 'Send full message snippet' + }, testing: { id: 'admin.email.testing', defaultMessage: 'Testing...' @@ -87,7 +95,8 @@ class EmailSettings extends React.Component { saveNeeded: false, serverError: null, emailSuccess: null, - emailFail: null + emailFail: null, + pushNotificationContents: this.props.config.EmailSettings.PushNotificationContents }; } @@ -125,6 +134,7 @@ class EmailSettings extends React.Component { config.EmailSettings.FeedbackEmail = ReactDOM.findDOMNode(this.refs.feedbackEmail).value.trim(); config.EmailSettings.SMTPServer = ReactDOM.findDOMNode(this.refs.SMTPServer).value.trim(); config.EmailSettings.PushNotificationServer = ReactDOM.findDOMNode(this.refs.PushNotificationServer).value.trim(); + config.EmailSettings.PushNotificationContents = ReactDOM.findDOMNode(this.refs.PushNotificationContents).value; config.EmailSettings.SMTPPort = ReactDOM.findDOMNode(this.refs.SMTPPort).value.trim(); config.EmailSettings.SMTPUsername = ReactDOM.findDOMNode(this.refs.SMTPUsername).value.trim(); config.EmailSettings.SMTPPassword = ReactDOM.findDOMNode(this.refs.SMTPPassword).value.trim(); @@ -928,6 +938,38 @@ class EmailSettings extends React.Component { +
+ +
+ +

+ +

+
+
+
{serverError} -- cgit v1.2.3-1-g7c22