Merge pull request #1814 from mattermost/PLT-1485a
PLT-1485 Adding last view channel sticky
Этот коммит содержится в:
@@ -679,6 +679,15 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
Srv.Store.Channel().UpdateLastViewedAt(id, c.Session.UserId)
|
Srv.Store.Channel().UpdateLastViewedAt(id, c.Session.UserId)
|
||||||
|
|
||||||
|
preference := model.Preference{
|
||||||
|
UserId: c.Session.UserId,
|
||||||
|
Category: model.PREFERENCE_CATEGORY_LAST,
|
||||||
|
Name: model.PREFERENCE_NAME_LAST_CHANNEL,
|
||||||
|
Value: id,
|
||||||
|
}
|
||||||
|
|
||||||
|
Srv.Store.Preference().Save(&model.Preferences{preference})
|
||||||
|
|
||||||
message := model.NewMessage(c.Session.TeamId, id, c.Session.UserId, model.ACTION_CHANNEL_VIEWED)
|
message := model.NewMessage(c.Session.TeamId, id, c.Session.UserId, model.ACTION_CHANNEL_VIEWED)
|
||||||
message.Add("channel_id", id)
|
message.Add("channel_id", id)
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ const (
|
|||||||
PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
|
PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
|
||||||
PREFERENCE_CATEGORY_TUTORIAL_STEPS = "tutorial_step"
|
PREFERENCE_CATEGORY_TUTORIAL_STEPS = "tutorial_step"
|
||||||
PREFERENCE_CATEGORY_ADVANCED_SETTINGS = "advanced_settings"
|
PREFERENCE_CATEGORY_ADVANCED_SETTINGS = "advanced_settings"
|
||||||
|
|
||||||
|
PREFERENCE_CATEGORY_LAST = "last"
|
||||||
|
PREFERENCE_NAME_LAST_CHANNEL = "channel"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Preference struct {
|
type Preference struct {
|
||||||
|
|||||||
@@ -238,7 +238,14 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
_, session := api.FindMultiSessionForTeamId(r, team.Id)
|
_, session := api.FindMultiSessionForTeamId(r, team.Id)
|
||||||
if session != nil {
|
if session != nil {
|
||||||
w.Header().Set(model.HEADER_TOKEN, session.Token)
|
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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user