From 80b3d14b56d685618c745fb6614bda93f59c18e5 Mon Sep 17 00:00:00 2001 From: Chris Duarte Date: Thu, 29 Mar 2018 20:50:24 -0700 Subject: Initialize timezone to a default state (#8560) --- model/user.go | 2 +- model/user_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/model/user.go b/model/user.go index 066ea5fd2..efe8f8db9 100644 --- a/model/user.go +++ b/model/user.go @@ -211,7 +211,7 @@ func (u *User) PreSave() { } if u.Timezone == nil { - u.Timezone = make(map[string]string) + u.Timezone = DefaultUserTimezone() } if len(u.Password) > 0 { diff --git a/model/user_test.go b/model/user_test.go index 4ef59f748..c1d1dafbd 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -39,6 +39,10 @@ func TestUserPreSave(t *testing.T) { if user.Timezone == nil { t.Fatal("Timezone is nil") } + + if user.Timezone["useAutomaticTimezone"] != "true" { + t.Fatal("Timezone is not set to default") + } } func TestUserPreUpdate(t *testing.T) { -- cgit v1.2.3-1-g7c22