diff options
Diffstat (limited to 'webapp/components')
3 files changed, 22 insertions, 2 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index e34167a30..6a07e31cd 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -28,6 +28,7 @@ export default class ConfigurationSettings extends AdminSettings { } getConfigFromState(config) { + config.ServiceSettings.SiteURL = this.state.siteURL; config.ServiceSettings.ListenAddress = this.state.listenAddress; config.ServiceSettings.WebserverMode = this.state.webserverMode; @@ -36,6 +37,7 @@ export default class ConfigurationSettings extends AdminSettings { getStateFromConfig(config) { return { + siteURL: config.ServiceSettings.SiteURL, listenAddress: config.ServiceSettings.ListenAddress, webserverMode: config.ServiceSettings.WebserverMode }; @@ -56,6 +58,24 @@ export default class ConfigurationSettings extends AdminSettings { return ( <SettingsGroup> <TextSetting + id='siteURL' + label={ + <FormattedMessage + id='admin.service.siteURL' + defaultMessage='Site URL:' + /> + } + placeholder={Utils.localizeMessage('admin.service.siteURLExample', 'Ex "https://mattermost.example.com:1234"')} + helpText={ + <FormattedMessage + id='admin.service.siteURLDescription' + defaultMessage='The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.' + /> + } + value={this.state.siteURL} + onChange={this.handleChange} + /> + <TextSetting id='listenAddress' label={ <FormattedMessage diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx index bcbe0a1a1..b6c7d38f3 100644 --- a/webapp/components/create_team/components/team_url.jsx +++ b/webapp/components/create_team/components/team_url.jsx @@ -105,7 +105,7 @@ export default class TeamUrl extends React.Component { nameDivClass += ' has-error'; } - const title = `${window.mm_config.SiteURL}/`; + const title = `${Utils.getSiteURL()}/`; const urlTooltip = ( <Tooltip id='urlTooltip'>{title}</Tooltip> ); diff --git a/webapp/components/integrations/components/installed_incoming_webhook.jsx b/webapp/components/integrations/components/installed_incoming_webhook.jsx index 008000012..965ed2bc9 100644 --- a/webapp/components/integrations/components/installed_incoming_webhook.jsx +++ b/webapp/components/integrations/components/installed_incoming_webhook.jsx @@ -97,7 +97,7 @@ export default class InstalledIncomingWebhook extends React.Component { id='installed_integrations.url' defaultMessage='URL: {url}' values={{ - url: window.mm_config.SiteURL + '/hooks/' + incomingWebhook.id + url: Utils.getSiteURL() + '/hooks/' + incomingWebhook.id }} /> </span> |