diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-14 08:56:56 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-14 08:56:56 -0400 |
commit | 1138dd67705829a6af0d6c610cf3dbe09082187c (patch) | |
tree | 23bdc3db76221bead172be1c51eb52a4987636f1 /webapp/components/admin_console/cluster_settings.jsx | |
parent | 40efd8367a85e3333e9b7cc45c390259d412088c (diff) | |
download | chat-1138dd67705829a6af0d6c610cf3dbe09082187c.tar.gz chat-1138dd67705829a6af0d6c610cf3dbe09082187c.tar.bz2 chat-1138dd67705829a6af0d6c610cf3dbe09082187c.zip |
PLT-6657 Move system console to use v4 endpoints and redux (#6572)
* Move system console to use v4 endpoints and redux
* Rename logs dir to get past gitignore
* Fix test email
* Update brand unit test
* Updates per feedback
Diffstat (limited to 'webapp/components/admin_console/cluster_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/cluster_settings.jsx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webapp/components/admin_console/cluster_settings.jsx b/webapp/components/admin_console/cluster_settings.jsx index 895a87ce1..14bc46240 100644 --- a/webapp/components/admin_console/cluster_settings.jsx +++ b/webapp/components/admin_console/cluster_settings.jsx @@ -11,9 +11,10 @@ import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import SettingsGroup from './settings_group.jsx'; import ClusterTableContainer from './cluster_table_container.jsx'; -import AdminStore from 'stores/admin_store.jsx'; import * as Utils from 'utils/utils.jsx'; +import {Client4} from 'mattermost-redux/client'; + export default class ClusterSettings extends AdminSettings { constructor(props) { super(props); @@ -74,7 +75,7 @@ export default class ClusterSettings extends AdminSettings { var configLoadedFromCluster = null; - if (AdminStore.getClusterId()) { + if (Client4.clusterId) { configLoadedFromCluster = ( <div style={{marginBottom: '10px'}} @@ -85,7 +86,7 @@ export default class ClusterSettings extends AdminSettings { id='admin.cluster.loadedFrom' defaultMessage='This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href="http://docs.mattermost.com/deployment/cluster.html" target="_blank">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.' values={{ - clusterId: AdminStore.getClusterId() + clusterId: Client4.clusterId }} /> </div> |