diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /webapp/components/admin_console/configuration_settings.jsx | |
parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip |
PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"
This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47.
* Removed automatic configuration of SiteURL
* Reverted unintentional config changes
* Updated help text
* Added link to docs in Site URL warning
* Fixed merge conflict
Diffstat (limited to 'webapp/components/admin_console/configuration_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/configuration_settings.jsx | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index ec5606fa1..16ebf1952 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -2,18 +2,20 @@ // See License.txt for license information. import React from 'react'; +import {FormattedMessage} from 'react-intl'; + +import ErrorStore from 'stores/error_store.jsx'; import * as Utils from 'utils/utils.jsx'; import AdminSettings from './admin_settings.jsx'; -import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; +import BooleanSetting from './boolean_setting.jsx'; +import {ConnectionSecurityDropdownSettingWebserver} from './connection_security_dropdown_setting.jsx'; +import PurgeCachesButton from './purge_caches.jsx'; +import ReloadConfigButton from './reload_config.jsx'; import SettingsGroup from './settings_group.jsx'; import TextSetting from './text_setting.jsx'; -import ReloadConfigButton from './reload_config.jsx'; -import PurgeCachesButton from './purge_caches.jsx'; import WebserverModeDropdownSetting from './webserver_mode_dropdown_setting.jsx'; -import {ConnectionSecurityDropdownSettingWebserver} from './connection_security_dropdown_setting.jsx'; -import BooleanSetting from './boolean_setting.jsx'; export default class ConfigurationSettings extends AdminSettings { constructor(props) { @@ -21,6 +23,8 @@ export default class ConfigurationSettings extends AdminSettings { this.getConfigFromState = this.getConfigFromState.bind(this); + this.handleSaved = this.handleSaved.bind(this); + this.renderSettings = this.renderSettings.bind(this); } @@ -62,6 +66,14 @@ export default class ConfigurationSettings extends AdminSettings { }; } + handleSaved(newConfig) { + const lastError = ErrorStore.getLastError(); + + if (lastError && lastError.message === 'error_bar.site_url' && newConfig.ServiceSettings.SiteURL) { + ErrorStore.clearLastError(true); + } + } + renderTitle() { return ( <FormattedMessage @@ -92,9 +104,9 @@ export default class ConfigurationSettings extends AdminSettings { } placeholder={Utils.localizeMessage('admin.service.siteURLExample', 'Ex "https://mattermost.example.com:1234"')} helpText={ - <FormattedHTMLMessage + <FormattedMessage id='admin.service.siteURLDescription' - defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.' + defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. This setting is required.' /> } value={this.state.siteURL} |