diff options
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 32 | ||||
-rw-r--r-- | webapp/components/admin_console/compliance_reports.jsx | 3 | ||||
-rw-r--r-- | webapp/components/admin_console/email_settings.jsx | 74 | ||||
-rw-r--r-- | webapp/components/admin_console/gitlab_settings.jsx | 17 | ||||
-rw-r--r-- | webapp/components/admin_console/image_settings.jsx | 18 | ||||
-rw-r--r-- | webapp/components/admin_console/license_settings.jsx | 1 | ||||
-rw-r--r-- | webapp/components/admin_console/log_settings.jsx | 34 | ||||
-rw-r--r-- | webapp/components/admin_console/privacy_settings.jsx | 34 | ||||
-rw-r--r-- | webapp/components/admin_console/rate_settings.jsx | 34 | ||||
-rw-r--r-- | webapp/components/admin_console/service_settings.jsx | 162 | ||||
-rw-r--r-- | webapp/components/admin_console/sql_settings.jsx | 18 | ||||
-rw-r--r-- | webapp/components/admin_console/team_settings.jsx | 64 | ||||
-rw-r--r-- | webapp/components/admin_console/user_item.jsx | 4 |
13 files changed, 248 insertions, 247 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index da406e647..4ffc31815 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -134,13 +134,13 @@ export default class AdminSidebar extends React.Component { placement='top' overlay={removeTooltip} > - <span - className='menu-icon--right menu__close' - onClick={this.removeTeam.bind(this, team.id)} - style={{cursor: 'pointer'}} - > - {'×'} - </span> + <span + className='menu-icon--right menu__close' + onClick={this.removeTeam.bind(this, team.id)} + style={{cursor: 'pointer'}} + > + {'×'} + </span> </OverlayTrigger> </a> </li> @@ -424,7 +424,7 @@ export default class AdminSidebar extends React.Component { </li> </ul> <ul className='nav nav__sub-menu'> - <li> + <li> <h4> <span className='icon fa fa-gear'></span> <span> @@ -442,14 +442,14 @@ export default class AdminSidebar extends React.Component { placement='top' overlay={addTeamTooltip} > - <a - href='#' - onClick={this.showTeamSelect} - > - <i - className='fa fa-plus' - ></i> - </a> + <a + href='#' + onClick={this.showTeamSelect} + > + <i + className='fa fa-plus' + ></i> + </a> </OverlayTrigger> </span> </h4> diff --git a/webapp/components/admin_console/compliance_reports.jsx b/webapp/components/admin_console/compliance_reports.jsx index 04b2c4deb..41d8ce32c 100644 --- a/webapp/components/admin_console/compliance_reports.jsx +++ b/webapp/components/admin_console/compliance_reports.jsx @@ -277,7 +277,8 @@ export default class ComplianceReports extends React.Component { <table> <tbody> <tr> - <td colSpan='5' + <td + colSpan='5' style={{paddingBottom: '6px'}} > <FormattedMessage diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index dcdf52486..71add9983 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -285,12 +285,12 @@ class EmailSettings extends React.Component { var emailSuccess = ''; if (this.state.emailSuccess) { emailSuccess = ( - <div className='alert alert-success'> + <div className='alert alert-success'> <i className='fa fa-check'></i> - <FormattedMessage - id='admin.email.emailSuccess' - defaultMessage='No errors were reported while sending an email. Please check your inbox to make sure.' - /> + <FormattedMessage + id='admin.email.emailSuccess' + defaultMessage='No errors were reported while sending an email. Please check your inbox to make sure.' + /> </div> ); } @@ -298,15 +298,15 @@ class EmailSettings extends React.Component { var emailFail = ''; if (this.state.emailFail) { emailSuccess = ( - <div className='alert alert-warning'> + <div className='alert alert-warning'> <i className='fa fa-warning'></i> - <FormattedMessage - id='admin.email.emailFail' - defaultMessage='Connection unsuccessful: {error}' - values={{ - error: this.state.emailFail - }} - /> + <FormattedMessage + id='admin.email.emailFail' + defaultMessage='Connection unsuccessful: {error}' + values={{ + error: this.state.emailFail + }} + /> </div> ); } @@ -507,10 +507,10 @@ class EmailSettings extends React.Component { defaultChecked={this.props.config.EmailSettings.EnableSignUpWithEmail} onChange={this.handleChange.bind(this, 'allowSignUpWithEmail_true')} /> - <FormattedMessage - id='admin.email.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.email.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -520,10 +520,10 @@ class EmailSettings extends React.Component { defaultChecked={!this.props.config.EmailSettings.EnableSignUpWithEmail} onChange={this.handleChange.bind(this, 'allowSignUpWithEmail_false')} /> - <FormattedMessage - id='admin.email.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.email.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -648,10 +648,10 @@ class EmailSettings extends React.Component { defaultChecked={this.props.config.EmailSettings.SendEmailNotifications} onChange={this.handleChange.bind(this, 'sendEmailNotifications_true')} /> - <FormattedMessage - id='admin.email.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.email.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -661,10 +661,10 @@ class EmailSettings extends React.Component { defaultChecked={!this.props.config.EmailSettings.SendEmailNotifications} onChange={this.handleChange.bind(this, 'sendEmailNotifications_false')} /> - <FormattedMessage - id='admin.email.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.email.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedHTMLMessage @@ -696,10 +696,10 @@ class EmailSettings extends React.Component { onChange={this.handleChange.bind(this, 'requireEmailVerification_true')} disabled={!this.state.sendEmailNotifications} /> - <FormattedMessage - id='admin.email.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.email.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -710,10 +710,10 @@ class EmailSettings extends React.Component { onChange={this.handleChange.bind(this, 'requireEmailVerification_false')} disabled={!this.state.sendEmailNotifications} /> - <FormattedMessage - id='admin.email.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.email.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage diff --git a/webapp/components/admin_console/gitlab_settings.jsx b/webapp/components/admin_console/gitlab_settings.jsx index 747905ac6..510fd0887 100644 --- a/webapp/components/admin_console/gitlab_settings.jsx +++ b/webapp/components/admin_console/gitlab_settings.jsx @@ -122,7 +122,6 @@ class GitLabSettings extends React.Component { className='form-horizontal' role='form' > - <div className='form-group'> <label className='control-label col-sm-4' @@ -143,10 +142,10 @@ class GitLabSettings extends React.Component { defaultChecked={this.props.config.GitLabSettings.Enable} onChange={this.handleChange.bind(this, 'EnableTrue')} /> - <FormattedMessage - id='admin.gitlab.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.gitlab.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -156,10 +155,10 @@ class GitLabSettings extends React.Component { defaultChecked={!this.props.config.GitLabSettings.Enable} onChange={this.handleChange.bind(this, 'EnableFalse')} /> - <FormattedMessage - id='admin.gitlab.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.gitlab.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage diff --git a/webapp/components/admin_console/image_settings.jsx b/webapp/components/admin_console/image_settings.jsx index 023e9af3b..64a7663c6 100644 --- a/webapp/components/admin_console/image_settings.jsx +++ b/webapp/components/admin_console/image_settings.jsx @@ -592,10 +592,10 @@ class FileSettings extends React.Component { defaultChecked={this.props.config.FileSettings.EnablePublicLink} onChange={this.handleChange} /> - <FormattedMessage - id='admin.image.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.image.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -605,10 +605,10 @@ class FileSettings extends React.Component { defaultChecked={!this.props.config.FileSettings.EnablePublicLink} onChange={this.handleChange} /> - <FormattedMessage - id='admin.image.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.image.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -689,4 +689,4 @@ FileSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(FileSettings);
\ No newline at end of file +export default injectIntl(FileSettings); diff --git a/webapp/components/admin_console/license_settings.jsx b/webapp/components/admin_console/license_settings.jsx index f2c511e44..14934a3e5 100644 --- a/webapp/components/admin_console/license_settings.jsx +++ b/webapp/components/admin_console/license_settings.jsx @@ -152,6 +152,7 @@ class LicenseSettings extends React.Component { {'Mattermost Enterprise Edition. Unlock enterprise features in this software through the purchase of a subscription from '} <a target='_blank' + rel='noopener noreferrer' href='https://mattermost.com/' > {'https://mattermost.com/'} diff --git a/webapp/components/admin_console/log_settings.jsx b/webapp/components/admin_console/log_settings.jsx index 061c2b6e3..9229c62bc 100644 --- a/webapp/components/admin_console/log_settings.jsx +++ b/webapp/components/admin_console/log_settings.jsx @@ -143,10 +143,10 @@ class LogSettings extends React.Component { defaultChecked={this.props.config.LogSettings.EnableConsole} onChange={this.handleChange.bind(this, 'console_true')} /> - <FormattedMessage - id='admin.log.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.log.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -156,10 +156,10 @@ class LogSettings extends React.Component { defaultChecked={!this.props.config.LogSettings.EnableConsole} onChange={this.handleChange.bind(this, 'console_false')} /> - <FormattedMessage - id='admin.log.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.log.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -221,10 +221,10 @@ class LogSettings extends React.Component { defaultChecked={this.props.config.LogSettings.EnableFile} onChange={this.handleChange.bind(this, 'file_true')} /> - <FormattedMessage - id='admin.log.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.log.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -234,10 +234,10 @@ class LogSettings extends React.Component { defaultChecked={!this.props.config.LogSettings.EnableFile} onChange={this.handleChange.bind(this, 'file_false')} /> - <FormattedMessage - id='admin.log.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.log.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -415,4 +415,4 @@ LogSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(LogSettings);
\ No newline at end of file +export default injectIntl(LogSettings); diff --git a/webapp/components/admin_console/privacy_settings.jsx b/webapp/components/admin_console/privacy_settings.jsx index 5045a6d31..8759472a2 100644 --- a/webapp/components/admin_console/privacy_settings.jsx +++ b/webapp/components/admin_console/privacy_settings.jsx @@ -108,10 +108,10 @@ class PrivacySettings extends React.Component { defaultChecked={this.props.config.PrivacySettings.ShowEmailAddress} onChange={this.handleChange} /> - <FormattedMessage - id='admin.privacy.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.privacy.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -121,10 +121,10 @@ class PrivacySettings extends React.Component { defaultChecked={!this.props.config.PrivacySettings.ShowEmailAddress} onChange={this.handleChange} /> - <FormattedMessage - id='admin.privacy.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.privacy.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -155,10 +155,10 @@ class PrivacySettings extends React.Component { defaultChecked={this.props.config.PrivacySettings.ShowFullName} onChange={this.handleChange} /> - <FormattedMessage - id='admin.privacy.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.privacy.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -168,10 +168,10 @@ class PrivacySettings extends React.Component { defaultChecked={!this.props.config.PrivacySettings.ShowFullName} onChange={this.handleChange} /> - <FormattedMessage - id='admin.privacy.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.privacy.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -212,4 +212,4 @@ PrivacySettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(PrivacySettings);
\ No newline at end of file +export default injectIntl(PrivacySettings); diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx index de7a40e6b..5eb099b8a 100644 --- a/webapp/components/admin_console/rate_settings.jsx +++ b/webapp/components/admin_console/rate_settings.jsx @@ -172,10 +172,10 @@ class RateSettings extends React.Component { defaultChecked={this.props.config.RateLimitSettings.EnableRateLimiter} onChange={this.handleChange.bind(this, 'EnableRateLimiterTrue')} /> - <FormattedMessage - id='admin.rate.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.rate.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -185,10 +185,10 @@ class RateSettings extends React.Component { defaultChecked={!this.props.config.RateLimitSettings.EnableRateLimiter} onChange={this.handleChange.bind(this, 'EnableRateLimiterFalse')} /> - <FormattedMessage - id='admin.rate.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.rate.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -280,10 +280,10 @@ class RateSettings extends React.Component { onChange={this.handleChange.bind(this, 'VaryByRemoteAddrTrue')} disabled={!this.state.EnableRateLimiter} /> - <FormattedMessage - id='admin.rate.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.rate.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -294,10 +294,10 @@ class RateSettings extends React.Component { onChange={this.handleChange.bind(this, 'VaryByRemoteAddrFalse')} disabled={!this.state.EnableRateLimiter} /> - <FormattedMessage - id='admin.rate.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.rate.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -368,4 +368,4 @@ RateSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(RateSettings);
\ No newline at end of file +export default injectIntl(RateSettings); diff --git a/webapp/components/admin_console/service_settings.jsx b/webapp/components/admin_console/service_settings.jsx index 90b6a39b4..dfd19d057 100644 --- a/webapp/components/admin_console/service_settings.jsx +++ b/webapp/components/admin_console/service_settings.jsx @@ -379,10 +379,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableIncomingWebhooks} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -392,10 +392,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableIncomingWebhooks} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -426,10 +426,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableOutgoingWebhooks} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -439,10 +439,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableOutgoingWebhooks} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -473,10 +473,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableCommands} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -486,10 +486,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableCommands} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -520,10 +520,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableOnlyAdminIntegrations} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -533,10 +533,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableOnlyAdminIntegrations} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -567,10 +567,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnablePostUsernameOverride} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -580,10 +580,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnablePostUsernameOverride} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -594,7 +594,7 @@ class ServiceSettings extends React.Component { </div> </div> - <div className='form-group'> + <div className='form-group'> <label className='control-label col-sm-4' htmlFor='EnablePostIconOverride' @@ -614,10 +614,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnablePostIconOverride} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -627,10 +627,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnablePostIconOverride} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -661,10 +661,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableTesting} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -674,10 +674,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableTesting} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -708,10 +708,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableDeveloper} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -721,10 +721,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableDeveloper} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -755,10 +755,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableSecurityFixAlert} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -768,10 +768,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableSecurityFixAlert} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -802,10 +802,10 @@ class ServiceSettings extends React.Component { defaultChecked={this.props.config.ServiceSettings.EnableInsecureOutgoingConnections} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.service.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -815,10 +815,10 @@ class ServiceSettings extends React.Component { defaultChecked={!this.props.config.ServiceSettings.EnableInsecureOutgoingConnections} onChange={this.handleChange} /> - <FormattedMessage - id='admin.service.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.service.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage diff --git a/webapp/components/admin_console/sql_settings.jsx b/webapp/components/admin_console/sql_settings.jsx index f2e005b83..a6e09b4a0 100644 --- a/webapp/components/admin_console/sql_settings.jsx +++ b/webapp/components/admin_console/sql_settings.jsx @@ -330,10 +330,10 @@ class SqlSettings extends React.Component { defaultChecked={this.props.config.SqlSettings.Trace} onChange={this.handleChange} /> - <FormattedMessage - id='admin.sql.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.sql.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -343,10 +343,10 @@ class SqlSettings extends React.Component { defaultChecked={!this.props.config.SqlSettings.Trace} onChange={this.handleChange} /> - <FormattedMessage - id='admin.sql.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.sql.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -387,4 +387,4 @@ SqlSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(SqlSettings);
\ No newline at end of file +export default injectIntl(SqlSettings); diff --git a/webapp/components/admin_console/team_settings.jsx b/webapp/components/admin_console/team_settings.jsx index e7bfcd74a..e3d7914a6 100644 --- a/webapp/components/admin_console/team_settings.jsx +++ b/webapp/components/admin_console/team_settings.jsx @@ -473,10 +473,10 @@ class TeamSettings extends React.Component { defaultChecked={this.props.config.TeamSettings.EnableTeamCreation} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.team.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -486,10 +486,10 @@ class TeamSettings extends React.Component { defaultChecked={!this.props.config.TeamSettings.EnableTeamCreation} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.team.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -520,10 +520,10 @@ class TeamSettings extends React.Component { defaultChecked={this.props.config.TeamSettings.EnableUserCreation} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.team.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -533,10 +533,10 @@ class TeamSettings extends React.Component { defaultChecked={!this.props.config.TeamSettings.EnableUserCreation} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.team.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -567,10 +567,10 @@ class TeamSettings extends React.Component { defaultChecked={this.props.config.TeamSettings.EnableOpenServer} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.team.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -580,10 +580,10 @@ class TeamSettings extends React.Component { defaultChecked={!this.props.config.TeamSettings.EnableOpenServer} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.team.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage @@ -643,10 +643,10 @@ class TeamSettings extends React.Component { defaultChecked={this.props.config.TeamSettings.RestrictTeamNames} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.true' - defaultMessage='true' - /> + <FormattedMessage + id='admin.team.true' + defaultMessage='true' + /> </label> <label className='radio-inline'> <input @@ -656,10 +656,10 @@ class TeamSettings extends React.Component { defaultChecked={!this.props.config.TeamSettings.RestrictTeamNames} onChange={this.handleChange} /> - <FormattedMessage - id='admin.team.false' - defaultMessage='false' - /> + <FormattedMessage + id='admin.team.false' + defaultMessage='false' + /> </label> <p className='help-text'> <FormattedMessage diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index ef6bd9f45..affd4b5a4 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -224,8 +224,8 @@ export default class UserItem extends React.Component { let showMakeSystemAdmin = user.roles === '' || user.roles === 'admin'; let showMakeActive = false; let showMakeNotActive = user.roles !== 'system_admin'; - let mfaEnabled = global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.MFA === 'true' && global.window.mm_config.EnableMultifactorAuthentication === 'true'; - let showMfaReset = mfaEnabled && user.mfa_active; + const mfaEnabled = global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.MFA === 'true' && global.window.mm_config.EnableMultifactorAuthentication === 'true'; + const showMfaReset = mfaEnabled && user.mfa_active; if (user.delete_at > 0) { currentRoles = ( |