From 8f87e60231c406d9f26c1b3a84abd725e544a187 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 14 Jun 2016 12:12:46 -0400 Subject: Fix bad condition on hiding email addresses and update user etag to include privacy settings (#3327) --- model/user.go | 4 ++-- model/user_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'model') diff --git a/model/user.go b/model/user.go index ab076894a..77d04a9bc 100644 --- a/model/user.go +++ b/model/user.go @@ -244,8 +244,8 @@ func (u *User) ToJson() string { } // Generate a valid strong etag so the browser can cache the results -func (u *User) Etag() string { - return Etag(u.Id, u.UpdateAt) +func (u *User) Etag(showFullName, showEmail bool) string { + return Etag(u.Id, u.UpdateAt, showFullName, showEmail) } func (u *User) IsOffline() bool { diff --git a/model/user_test.go b/model/user_test.go index d8ef77d6a..899542a05 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -33,7 +33,7 @@ func TestUserJson(t *testing.T) { func TestUserPreSave(t *testing.T) { user := User{Password: "test"} user.PreSave() - user.Etag() + user.Etag(true, true) } func TestUserPreUpdate(t *testing.T) { -- cgit v1.2.3-1-g7c22