diff options
author | enahum <nahumhbl@gmail.com> | 2016-06-15 09:10:38 -0300 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-15 08:10:38 -0400 |
commit | 3f4d38f58ae086c6570bea7082f25cbdbc52c85d (patch) | |
tree | c83e3fffb591a702fe70b2da4465e89d1a011f5a /webapp/components/admin_console/multiselect_settings.jsx | |
parent | c7e9f3cb1b9cedb328da28aa5f4237fdc325e68c (diff) | |
download | chat-3f4d38f58ae086c6570bea7082f25cbdbc52c85d.tar.gz chat-3f4d38f58ae086c6570bea7082f25cbdbc52c85d.tar.bz2 chat-3f4d38f58ae086c6570bea7082f25cbdbc52c85d.zip |
PLT-3344 Set Localization config to always have by default all languages available (#3339)
Diffstat (limited to 'webapp/components/admin_console/multiselect_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/multiselect_settings.jsx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webapp/components/admin_console/multiselect_settings.jsx b/webapp/components/admin_console/multiselect_settings.jsx index ca0bdc9aa..8aad5d6eb 100644 --- a/webapp/components/admin_console/multiselect_settings.jsx +++ b/webapp/components/admin_console/multiselect_settings.jsx @@ -19,9 +19,7 @@ export default class MultiSelectSetting extends React.Component { return n.value; }); - if (!newValue || newValue.length === 0) { - this.setState({error: this.props.errorText}); - } else if (this.props.mustBePresent && values.join(',').indexOf(this.props.mustBePresent) === -1) { + if (this.props.selected.length > 0 && this.props.mustBePresent && values.join(',').indexOf(this.props.mustBePresent) === -1) { this.setState({error: this.props.notPresent}); } else { this.props.onChange(this.props.id, values); @@ -30,7 +28,7 @@ export default class MultiSelectSetting extends React.Component { } componentWillReceiveProps(newProps) { - if (newProps.mustBePresent && newProps.selected.join(',').indexOf(newProps.mustBePresent) === -1) { + if (newProps.selected.length > 0 && newProps.mustBePresent && newProps.selected.join(',').indexOf(newProps.mustBePresent) === -1) { this.setState({error: this.props.notPresent}); } else { this.setState({error: false}); |