diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-08-02 08:44:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 08:44:25 -0400 |
commit | 6ff7e4ea4b23a50a65d295aae163fb96f21cdcff (patch) | |
tree | 6a6577b47bd8766bafee2e4ecb9e663138a388f0 /webapp/components/admin_console | |
parent | 65817e13c7900ea81947e40e177459cfea8acee4 (diff) | |
download | chat-6ff7e4ea4b23a50a65d295aae163fb96f21cdcff.tar.gz chat-6ff7e4ea4b23a50a65d295aae163fb96f21cdcff.tar.bz2 chat-6ff7e4ea4b23a50a65d295aae163fb96f21cdcff.zip |
Change refresh on version change to be after explicit click (#7090)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r-- | webapp/components/admin_console/admin_console.jsx | 3 | ||||
-rw-r--r-- | webapp/components/admin_console/system_users/system_users.jsx | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/webapp/components/admin_console/admin_console.jsx b/webapp/components/admin_console/admin_console.jsx index 99256d7d4..17670d6ab 100644 --- a/webapp/components/admin_console/admin_console.jsx +++ b/webapp/components/admin_console/admin_console.jsx @@ -8,6 +8,8 @@ import 'bootstrap'; import AnnouncementBar from 'components/announcement_bar'; import AdminSidebar from './admin_sidebar.jsx'; +import {reloadIfServerVersionChanged} from 'actions/global_actions.jsx'; + export default class AdminConsole extends React.Component { static propTypes = { @@ -32,6 +34,7 @@ export default class AdminConsole extends React.Component { componentWillMount() { this.props.actions.getConfig(); + reloadIfServerVersionChanged(); } render() { diff --git a/webapp/components/admin_console/system_users/system_users.jsx b/webapp/components/admin_console/system_users/system_users.jsx index 4fbdc26d8..db8400217 100644 --- a/webapp/components/admin_console/system_users/system_users.jsx +++ b/webapp/components/admin_console/system_users/system_users.jsx @@ -16,6 +16,7 @@ import AnalyticsStore from 'stores/analytics_store.jsx'; import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; +import {reloadIfServerVersionChanged} from 'actions/global_actions.jsx'; import {getStandardAnalytics} from 'actions/admin_actions.jsx'; import {Constants, StatTypes, UserSearchOptions} from 'utils/constants.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -102,7 +103,7 @@ export default class SystemUsers extends React.Component { UserStore.addWithoutTeamChangeListener(this.updateUsersFromStore); this.loadDataForTeam(this.state.teamId); - this.props.actions.getTeams(0, 1000); + this.props.actions.getTeams(0, 1000).then(reloadIfServerVersionChanged); } componentWillUpdate(nextProps, nextState) { |