diff options
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/admin_console/configuration_settings.jsx | 2 | ||||
-rw-r--r-- | webapp/components/admin_console/recycle_db.jsx | 12 | ||||
-rw-r--r-- | webapp/components/admin_console/reload_config.jsx | 14 | ||||
-rw-r--r-- | webapp/i18n/en.json | 2 |
4 files changed, 26 insertions, 4 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx index 5934cf141..0a2e32f77 100644 --- a/webapp/components/admin_console/configuration_settings.jsx +++ b/webapp/components/admin_console/configuration_settings.jsx @@ -44,7 +44,6 @@ export default class ConfigurationSettings extends AdminSettings { renderSettings() { return ( <SettingsGroup> - <ReloadConfigButton/> <TextSetting id='listenAddress' label={ @@ -63,6 +62,7 @@ export default class ConfigurationSettings extends AdminSettings { value={this.state.listenAddress} onChange={this.handleChange} /> + <ReloadConfigButton/> </SettingsGroup> ); } diff --git a/webapp/components/admin_console/recycle_db.jsx b/webapp/components/admin_console/recycle_db.jsx index c863fccd2..e421711e7 100644 --- a/webapp/components/admin_console/recycle_db.jsx +++ b/webapp/components/admin_console/recycle_db.jsx @@ -6,7 +6,7 @@ import React from 'react'; import Client from 'utils/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; export default class RecycleDbButton extends React.Component { constructor(props) { @@ -64,6 +64,13 @@ export default class RecycleDbButton extends React.Component { ); } + let helpText = ( + <FormattedHTMLMessage + id='admin.recycle.recycleDescription' + defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired confugration and using the <a href="../general/configuration"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.' + /> + ); + let contents = null; if (this.state.loading) { contents = ( @@ -93,6 +100,9 @@ export default class RecycleDbButton extends React.Component { </button> {testMessage} </div> + <div className='help-text'> + {helpText} + </div> </div> </div> ); diff --git a/webapp/components/admin_console/reload_config.jsx b/webapp/components/admin_console/reload_config.jsx index 19395fa53..633993296 100644 --- a/webapp/components/admin_console/reload_config.jsx +++ b/webapp/components/admin_console/reload_config.jsx @@ -6,7 +6,7 @@ import React from 'react'; import Client from 'utils/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; export default class ReloadConfigButton extends React.Component { constructor(props) { @@ -64,6 +64,13 @@ export default class ReloadConfigButton extends React.Component { ); } + let helpText = ( + <FormattedHTMLMessage + id='admin.reload.reloadDescription' + defaultMessage='Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating "config.json" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href="../advanced/database"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.' + /> + ); + let contents = null; if (this.state.loading) { contents = ( @@ -93,8 +100,11 @@ export default class ReloadConfigButton extends React.Component { </button> {testMessage} </div> + <div className='help-text'> + {helpText} + </div> </div> </div> ); } -}
\ No newline at end of file +} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index fd35e3fac..1595c2c82 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -387,10 +387,12 @@ "admin.recycle.button": "Recycle Database Connections", "admin.recycle.loading": " Recycling...", "admin.recycle.reloadFail": "Recycling unsuccessful: {error}", + "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired confugration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.", "admin.regenerate": "Regenerate", "admin.reload.button": "Reload Configuration From Disk", "admin.reload.loading": " Loading...", "admin.reload.reloadFail": "Reloading unsuccessful: {error}", + "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.", "admin.reset_password.close": "Close", "admin.reset_password.newPassword": "New Password", "admin.reset_password.select": "Select", |