OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #925 from matrix-org/luke/new-guest-access-fix-team-server-no-config 

Allow teamServerConfig to be missing
pull/21833/head
Luke Barnard 2017-05-25 15:07:54 +01:00 committed by GitHub
parent c54a24c49a 51c8ee6db2
commit 09c5b2f3d5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/LoggedInView.js
View File

@ -232,9 +232,15 @@ export default React.createClass({
break; break;
case PageTypes.HomePage: case PageTypes.HomePage:
// If team server config is present, pass the teamServerURL. props.teamToken
// must also be set for the team page to be displayed, otherwise the
// welcomePageUrl is used (which might be undefined).
const teamServerUrl = this.props.config.teamServerConfig ?
this.props.config.teamServerConfig.teamServerURL : null;
page_element = <HomePage page_element = <HomePage
collapsedRhs={this.props.collapse_rhs} collapsedRhs={this.props.collapse_rhs}
teamServerUrl={this.props.config.teamServerConfig.teamServerURL} teamServerUrl={teamServerUrl}
teamToken={this.props.teamToken} teamToken={this.props.teamToken}
homePageUrl={this.props.config.welcomePageUrl} homePageUrl={this.props.config.welcomePageUrl}
/>; />;