summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-01-06 09:15:44 -0500
committerChristopher Speller <crspeller@gmail.com>2016-01-06 09:15:44 -0500
commitfcb87ca42ff18e5fbf562b43390f4f99607289b1 (patch)
treeb82f1aab45cd1d55f4f4743049983033e1142607 /web
parentcc5e8be7331ef2d85dd70261d90cde63d3e82993 (diff)
parentf0e620a4851a61b8164c09bc6f95ee1df5859838 (diff)
downloadchat-fcb87ca42ff18e5fbf562b43390f4f99607289b1.tar.gz
chat-fcb87ca42ff18e5fbf562b43390f4f99607289b1.tar.bz2
chat-fcb87ca42ff18e5fbf562b43390f4f99607289b1.zip
Merge pull request #1814 from mattermost/PLT-1485a
PLT-1485 Adding last view channel sticky
Diffstat (limited to 'web')
-rw-r--r--web/web.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go
index 1f693c873..30a70ba2e 100644
--- a/web/web.go
+++ b/web/web.go
@@ -238,7 +238,14 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) {
_, session := api.FindMultiSessionForTeamId(r, team.Id)
if session != nil {
w.Header().Set(model.HEADER_TOKEN, session.Token)
- http.Redirect(w, r, c.GetSiteURL()+"/"+team.Name+"/channels/town-square", http.StatusTemporaryRedirect)
+ lastViewChannelName := "town-square"
+ if lastViewResult := <-api.Srv.Store.Preference().Get(session.UserId, model.PREFERENCE_CATEGORY_LAST, model.PREFERENCE_NAME_LAST_CHANNEL); lastViewResult.Err == nil {
+ if lastViewChannelResult := <-api.Srv.Store.Channel().Get(lastViewResult.Data.(model.Preference).Value); lastViewChannelResult.Err == nil {
+ lastViewChannelName = lastViewChannelResult.Data.(*model.Channel).Name
+ }
+ }
+
+ http.Redirect(w, r, c.GetSiteURL()+"/"+team.Name+"/channels/"+lastViewChannelName, http.StatusTemporaryRedirect)
return
}