IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1344 from mattermost/tutorial-fix

Browse Source 
Add tutorial pref for new users by default
This commit is contained in:
Joram Wilander
2015-11-06 14:24:23 -05:00
parent 32069345b5 6a59847070
commit 42a9c0e90b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/preference_test.go
View File

@@ -48,14 +48,8 @@ func TestGetAllPreferences(t *testing.T) {
if result, err := Client.GetAllPreferences(); err != nil {
t.Fatal(err)
} else if data := result.Data.(model.Preferences); len(data) != 3 {
} else if data := result.Data.(model.Preferences); len(data) != 4 {
t.Fatal("received the wrong number of preferences")
} else if !((data[0] == preferences1[0] && data[1] == preferences1[1]) || (data[0] == preferences1[1] && data[1] == preferences1[0])) {
for i := 0; i < 3; i++ {
if data[0] != preferences1[i] && data[1] != preferences1[i] && data[2] != preferences1[i] {
t.Fatal("got incorrect preferences")
}
}
}
Client.LoginByEmail(team.Name, user2.Email, "pwd")
@@ -63,7 +57,7 @@ func TestGetAllPreferences(t *testing.T) {
// note that user2 will automatically have a preference set for them to show user1 for direct messages
if result, err := Client.GetAllPreferences(); err != nil {
t.Fatal(err)
} else if data := result.Data.(model.Preferences); len(data) != 1 {
} else if data := result.Data.(model.Preferences); len(data) != 2 {
t.Fatal("received the wrong number of preferences")
}
}

5
api/user.go
View File

@@ -213,6 +213,11 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User {
}
}
pref := model.Preference{UserId: ruser.Id, Category: model.PREFERENCE_CATEGORY_TUTORIAL_STEPS, Name: ruser.Id, Value: "0"}
if presult := <-Srv.Store.Preference().Save(&model.Preferences{pref}); presult.Err != nil {
l4g.Error("Encountered error saving tutorial preference, err=%v", presult.Err.Message)
}
ruser.Sanitize(map[string]bool{})
// This message goes to every channel, so the channelId is irrelevant

1
model/preference.go
View File

@@ -11,6 +11,7 @@ import (
const (
PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
PREFERENCE_CATEGORY_TUTORIAL_STEPS = "tutorial_step"
)
type Preference struct {