Adding email to admin console

1 files changed, 42 insertions, 8 deletions

diff --git a/web/react/components/admin_console/log_settings.jsx b/web/react/components/admin_console/log_settings.jsx
index 4e3db8f68..2707ce6b6 100644
--- a/web/react/components/admin_console/log_settings.jsx
+++ b/web/react/components/admin_console/log_settings.jsx
@@ -12,13 +12,33 @@ export default class LogSettings extends React.Component {
         this.handleSubmit = this.handleSubmit.bind(this);
 
         this.state = {
+            consoleEnable: this.props.config.LogSettings.ConsoleEnable,
+            fileEnable: this.props.config.LogSettings.FileEnable,
             saveNeeded: false,
             serverError: null
         };
     }
 
-    handleChange() {
-        this.setState({saveNeeded: true, serverError: this.state.serverError});
+    handleChange(action) {
+        var s = {saveNeeded: true, serverError: this.state.serverError};
+
+        if (action === 'console_true') {
+            s.consoleEnable = true;
+        }
+
+        if (action === 'console_false') {
+            s.consoleEnable = false;
+        }
+
+        if (action === 'file_true') {
+            s.fileEnable = true;
+        }
+
+        if (action === 'file_false') {
+            s.fileEnable = false;
+        }
+
+        this.setState(s);
     }
 
     handleSubmit(e) {
@@ -37,11 +57,21 @@ export default class LogSettings extends React.Component {
             config,
             () => {
                 AsyncClient.getConfig();
-                this.setState({serverError: null, saveNeeded: false});
+                this.setState({
+                    consoleEnable: config.LogSettings.ConsoleEnable,
+                    fileEnable: config.LogSettings.FileEnable,
+                    serverError: null,
+                    saveNeeded: false
+                });
                 $('#save-button').button('reset');
             },
             (err) => {
-                this.setState({serverError: err.message, saveNeeded: true});
+                this.setState({
+                    consoleEnable: config.LogSettings.ConsoleEnable,
+                    fileEnable: config.LogSettings.FileEnable,
+                    serverError: err.message,
+                    saveNeeded: true
+                });
                 $('#save-button').button('reset');
             }
         );
@@ -81,7 +111,7 @@ export default class LogSettings extends React.Component {
                                     value='true'
                                     ref='consoleEnable'
                                     defaultChecked={this.props.config.LogSettings.ConsoleEnable}
-                                    onChange={this.handleChange}
+                                    onChange={this.handleChange.bind(this, 'console_true')}
                                 />
                                     {'true'}
                             </label>
@@ -91,7 +121,7 @@ export default class LogSettings extends React.Component {
                                     name='consoleEnable'
                                     value='false'
                                     defaultChecked={!this.props.config.LogSettings.ConsoleEnable}
-                                    onChange={this.handleChange}
+                                    onChange={this.handleChange.bind(this, 'console_false')}
                                 />
                                     {'false'}
                             </label>
@@ -113,6 +143,7 @@ export default class LogSettings extends React.Component {
                                 ref='consoleLevel'
                                 defaultValue={this.props.config.LogSettings.consoleLevel}
                                 onChange={this.handleChange}
+                                disabled={!this.state.consoleEnable}
                             >
                                 <option value='DEBUG'>{'DEBUG'}</option>
                                 <option value='INFO'>{'INFO'}</option>
@@ -136,7 +167,7 @@ export default class LogSettings extends React.Component {
                                     ref='fileEnable'
                                     value='true'
                                     defaultChecked={this.props.config.LogSettings.FileEnable}
-                                    onChange={this.handleChange}
+                                    onChange={this.handleChange.bind(this, 'file_true')}
                                 />
                                     {'true'}
                             </label>
@@ -146,7 +177,7 @@ export default class LogSettings extends React.Component {
                                     name='fileEnable'
                                     value='false'
                                     defaultChecked={!this.props.config.LogSettings.FileEnable}
-                                    onChange={this.handleChange}
+                                    onChange={this.handleChange.bind(this, 'file_false')}
                                 />
                                     {'false'}
                             </label>
@@ -168,6 +199,7 @@ export default class LogSettings extends React.Component {
                                 ref='fileLevel'
                                 defaultValue={this.props.config.LogSettings.FileLevel}
                                 onChange={this.handleChange}
+                                disabled={!this.state.fileEnable}
                             >
                                 <option value='DEBUG'>{'DEBUG'}</option>
                                 <option value='INFO'>{'INFO'}</option>
@@ -193,6 +225,7 @@ export default class LogSettings extends React.Component {
                                 placeholder='Enter your file location'
                                 defaultValue={this.props.config.LogSettings.FileLocation}
                                 onChange={this.handleChange}
+                                disabled={!this.state.fileEnable}
                             />
                             <p className='help-text'>{'File to which log files are written. If blank, will be set to ./logs/mattermost.log. Log rotation is enabled and new files may be created in the same directory.'}</p>
                         </div>
@@ -214,6 +247,7 @@ export default class LogSettings extends React.Component {
                                 placeholder='Enter your file format'
                                 defaultValue={this.props.config.LogSettings.FileFormat}
                                 onChange={this.handleChange}
+                                disabled={!this.state.fileEnable}
                             />
                             <p className='help-text'>
                                 {'Format of log message output. If blank will be set to "[%D %T] [%L] %M", where:'}