diff options
Diffstat (limited to 'webapp/components/user_settings')
4 files changed, 9 insertions, 9 deletions
diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx index e10fd5154..cc81c2faf 100644 --- a/webapp/components/user_settings/email_notification_setting.jsx +++ b/webapp/components/user_settings/email_notification_setting.jsx @@ -24,7 +24,7 @@ export default class EmailNotificationSetting extends React.Component { enableEmail: React.PropTypes.bool.isRequired, onChange: React.PropTypes.func.isRequired, onSubmit: React.PropTypes.func.isRequired, - serverError: React.PropTypes.string.isRequired + serverError: React.PropTypes.string }; constructor(props) { diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx index 4346c952b..70306d871 100644 --- a/webapp/components/user_settings/user_settings_advanced.jsx +++ b/webapp/components/user_settings/user_settings_advanced.jsx @@ -175,8 +175,8 @@ export default class AdvancedSettingsDisplay extends React.Component { defaultMessage='Enable Post Formatting' /> } - inputs={ - <div> + inputs={[ + <div key='formattingSetting'> <div className='radio'> <label> <input @@ -215,7 +215,7 @@ export default class AdvancedSettingsDisplay extends React.Component { /> </div> </div> - } + ]} submit={() => this.handleSubmit('formatting')} server_error={this.state.serverError} updateSection={(e) => { @@ -251,8 +251,8 @@ export default class AdvancedSettingsDisplay extends React.Component { defaultMessage='Enable Join/Leave Messages' /> } - inputs={ - <div> + inputs={[ + <div key='joinLeaveSetting'> <div className='radio'> <label> <input @@ -291,7 +291,7 @@ export default class AdvancedSettingsDisplay extends React.Component { /> </div> </div> - } + ]} submit={() => this.handleSubmit('join_leave')} server_error={this.state.serverError} updateSection={(e) => { diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index 35df53e0e..da7b9d757 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -885,7 +885,7 @@ export default class NotificationsTab extends React.Component { <EmailNotificationSetting activeSection={this.props.activeSection} updateSection={this.props.updateSection} - enableEmail={this.state.enableEmail} + enableEmail={this.state.enableEmail === 'true'} onChange={this.handleEmailRadio} onSubmit={this.handleSubmit} serverError={this.state.serverError} diff --git a/webapp/components/user_settings/user_settings_theme.jsx b/webapp/components/user_settings/user_settings_theme.jsx index fb3665984..5a286a396 100644 --- a/webapp/components/user_settings/user_settings_theme.jsx +++ b/webapp/components/user_settings/user_settings_theme.jsx @@ -257,7 +257,7 @@ export default class ThemeSetting extends React.Component { inputs.push(custom); inputs.push( - <div> + <div key='otherThemes'> <br/> <a href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples' |