Merge pull request #808 from mattermost/fixing-redirect2

fixing more redirect places

3 files changed, 4 insertions, 3 deletions

diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx
index 4efb9cb23..44c54db72 100644
--- a/web/react/components/delete_channel_modal.jsx
+++ b/web/react/components/delete_channel_modal.jsx
@@ -4,6 +4,7 @@
 const Client = require('../utils/client.jsx');
 const AsyncClient = require('../utils/async_client.jsx');
 const ChannelStore = require('../stores/channel_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
 
 export default class DeleteChannelModal extends React.Component {
     constructor(props) {
@@ -24,7 +25,7 @@ export default class DeleteChannelModal extends React.Component {
         Client.deleteChannel(this.state.channelId,
             function handleDeleteSuccess() {
                 AsyncClient.getChannels(true);
-                window.location.href = '/';
+                window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square';
             },
             function handleDeleteError(err) {
                 AsyncClient.dispatchError(err, 'handleDelete');
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index da9874b0b..bdb50cd9e 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -262,7 +262,7 @@ export default class Navbar extends React.Component {
         return (
             <div className='navbar-brand'>
                 <a
-                    href='/'
+                    href={TeamStore.getCurrentTeamUrl() + '/channels/town-square'}
                     className='heading'
                 >
                     {channelTitle}
diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx
index 2849b4cbb..a4972dd8d 100644
--- a/web/react/components/team_signup_with_sso.jsx
+++ b/web/react/components/team_signup_with_sso.jsx
@@ -42,7 +42,7 @@ export default class SSOSignUpPage extends React.Component {
                 if (data.follow_link) {
                     window.location.href = data.follow_link;
                 } else {
-                    window.location.href = '/';
+                    window.location.href = '/' + team.name + '/channels/town-square';
                 }
             },
             function fail(err) {