opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-10-28 02:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1101 from stasvovk/admin_console_urls

Browse Source 
#962: change url when a user navigates between tabs in admin console
This commit is contained in:
Harrison Healey
2015-10-19 10:10:09 -04:00
parent 814aa57fc1 9fa3c996d5
commit 2d0b952941
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/react/components/admin_console/admin_controller.jsx
+9 -3
View File
@@ -40,9 +40,13 @@ export default class AdminController extends React.Component {
config: AdminStore.getConfig(),
teams: AdminStore.getAllTeams(),
selectedTeams,
selected: 'service_settings',
selectedTeam: null
selected: props.tab || 'service_settings',
selectedTeam: props.teamId || null
};
if (!props.tab) {
history.replaceState(null, null, `/admin_console/${this.state.selected}`);
}
}
componentDidMount() {
@@ -142,7 +146,9 @@ export default class AdminController extends React.Component {
} else if (this.state.selected === 'service_settings') {
tab = <ServiceSettingsTab config={this.state.config} />;
} else if (this.state.selected === 'team_users') {
tab = <TeamUsersTab team={this.state.teams[this.state.selectedTeam]} />;
if (this.state.teams) {
tab = <TeamUsersTab team={this.state.teams[this.state.selectedTeam]} />;
}
}
}
web/react/components/admin_console/admin_sidebar.jsx
+1
View File
@@ -24,6 +24,7 @@ export default class AdminSidebar extends React.Component {
handleClick(name, teamId, e) {
e.preventDefault();
this.props.selectTab(name, teamId);
history.pushState({name: name, teamId: teamId}, null, `/admin_console/${name}/${teamId || ''}`);
}
isSelected(name, teamId) {