summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-09-25 12:01:09 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-09-25 12:01:09 -0400
commit4ef5981e6c43b18cb20d44d2ee96dca02fc3a684 (patch)
treecd1d11ac768af0d9b98e85660a06a22c65fabaa7 /web/react
parente743ad483aed6c730bb8636bb089a6ef8d8d0097 (diff)
parente05c6ed6d1df0ccd7c05f237a3b935ca98c93d60 (diff)
downloadchat-4ef5981e6c43b18cb20d44d2ee96dca02fc3a684.tar.gz
chat-4ef5981e6c43b18cb20d44d2ee96dca02fc3a684.tar.bz2
chat-4ef5981e6c43b18cb20d44d2ee96dca02fc3a684.zip
Merge pull request #806 from mattermost/fixing-redirect
redirect to team after login
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/signup_user_complete.jsx2
-rw-r--r--web/react/components/team_signup_password_page.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 8311747ee..495159efc 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -84,7 +84,7 @@ export default class SignupUserComplete extends React.Component {
if (this.props.hash > 0) {
BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: 'finished'}));
}
- window.location.href = '/';
+ window.location.href = '/' + this.props.teamName + '/channels/town-square';
}.bind(this),
function emailLoginFailure(err) {
if (err.message === 'Login failed because email address has not been verified') {
diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx
index b26d9f6ce..105e4817a 100644
--- a/web/react/components/team_signup_password_page.jsx
+++ b/web/react/components/team_signup_password_page.jsx
@@ -53,7 +53,7 @@ export default class TeamSignupPasswordPage extends React.Component {
props.state.wizard = 'finished';
props.updateParent(props.state, true);
- window.location.href = '/';
+ window.location.href = '/' + teamSignup.team.name + '/channels/town-square';
}.bind(this),
function loginFail(err) {
if (err.message === 'Login failed because email address has not been verified') {