diff options
Diffstat (limited to 'webapp/components/admin_console')
4 files changed, 6 insertions, 5 deletions
diff --git a/webapp/components/admin_console/admin_sidebar_section.jsx b/webapp/components/admin_console/admin_sidebar_section.jsx index a958150b5..097907bfa 100644 --- a/webapp/components/admin_console/admin_sidebar_section.jsx +++ b/webapp/components/admin_console/admin_sidebar_section.jsx @@ -79,8 +79,6 @@ export default class AdminSidebarSection extends React.Component { sidebarItem = ( <div className={`${className}-title`} - activeClassName={`${className}-title ${className}-title--active`} - onlyActiveOnIndex={this.props.onlyActiveOnIndex} > <span className={`${className}-title__text`}> {this.props.title} diff --git a/webapp/components/admin_console/file_upload_setting.jsx b/webapp/components/admin_console/file_upload_setting.jsx index 0c1efc168..85cb7f499 100644 --- a/webapp/components/admin_console/file_upload_setting.jsx +++ b/webapp/components/admin_console/file_upload_setting.jsx @@ -51,7 +51,6 @@ export default class FileUploadSetting extends Setting { if (error) { Utils.clearFileInput(this.refs.fileInput); } - this.setState({fileSelected: false, fileName: null, serverError: error}); }); } @@ -61,7 +60,7 @@ export default class FileUploadSetting extends Setting { serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>; } - var btnClass = 'btn'; + let btnClass = 'btn'; if (this.state.fileSelected) { btnClass = 'btn btn-primary'; } diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx index fce0f18ea..49550d8af 100644 --- a/webapp/components/admin_console/team_users.jsx +++ b/webapp/components/admin_console/team_users.jsx @@ -191,6 +191,7 @@ export default class UserList extends React.Component { const service = (user.auth_service === Constants.LDAP_SERVICE || user.auth_service === Constants.SAML_SERVICE) ? user.auth_service.toUpperCase() : Utils.toTitleCase(user.auth_service); info.push( <FormattedHTMLMessage + key='admin.user_item.authServiceNotEmail' id='admin.user_item.authServiceNotEmail' defaultMessage='<strong>Sign-in Method:</strong> {service}' values={{ @@ -201,6 +202,7 @@ export default class UserList extends React.Component { } else { info.push( <FormattedHTMLMessage + key='admin.user_item.authServiceEmail' id='admin.user_item.authServiceEmail' defaultMessage='<strong>Sign-in Method:</strong> Email' /> @@ -212,6 +214,7 @@ export default class UserList extends React.Component { if (user.mfa_active) { info.push( <FormattedHTMLMessage + key='admin.user_item.mfaYes' id='admin.user_item.mfaYes' defaultMessage='<strong>MFA</strong>: Yes' /> @@ -219,6 +222,7 @@ export default class UserList extends React.Component { } else { info.push( <FormattedHTMLMessage + key='admin.user_item.mfaNo' id='admin.user_item.mfaNo' defaultMessage='<strong>MFA</strong>: No' /> diff --git a/webapp/components/admin_console/text_setting.jsx b/webapp/components/admin_console/text_setting.jsx index a5844aca7..47a501dcc 100644 --- a/webapp/components/admin_console/text_setting.jsx +++ b/webapp/components/admin_console/text_setting.jsx @@ -18,7 +18,7 @@ export default class TextSetting extends React.Component { React.PropTypes.number ]).isRequired, maxLength: React.PropTypes.number, - onChange: React.PropTypes.func.isRequired, + onChange: React.PropTypes.func, disabled: React.PropTypes.bool, type: React.PropTypes.oneOf([ 'input', |