diff options
| author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-03-29 14:58:18 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2018-03-29 14:58:18 -0400 |
| commit | 0affad9c247303d2e6c23bf45e3b5a33332f0aee (patch) | |
| tree | eee9a678b88fc288cb0689b540252099180f6cc1 | |
| parent | 014a3b6a60610ba592c5843080686f4481553136 (diff) | |
| download | chat-0affad9c247303d2e6c23bf45e3b5a33332f0aee.tar.gz chat-0affad9c247303d2e6c23bf45e3b5a33332f0aee.tar.bz2 chat-0affad9c247303d2e6c23bf45e3b5a33332f0aee.zip | |
fix user timezone initialization (#8547)
On PreSave, need to ensure TimeZone isn't left as NULL.
| -rw-r--r-- | model/user.go | 2 | ||||
| -rw-r--r-- | model/user_test.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/model/user.go b/model/user.go index c3a6ec04a..066ea5fd2 100644 --- a/model/user.go +++ b/model/user.go @@ -211,7 +211,7 @@ func (u *User) PreSave() { } if u.Timezone == nil { - u.Props = make(map[string]string) + u.Timezone = make(map[string]string) } if len(u.Password) > 0 { diff --git a/model/user_test.go b/model/user_test.go index 72ad6a92b..4ef59f748 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -36,6 +36,9 @@ func TestUserPreSave(t *testing.T) { user := User{Password: "test"} user.PreSave() user.Etag(true, true) + if user.Timezone == nil { + t.Fatal("Timezone is nil") + } } func TestUserPreUpdate(t *testing.T) { |