ami/tl-vikunja
1
0
Fork 0
Code Activity

fix(user): make reset the user's name to empty actually work

Browse Source
This commit is contained in:
kolaente
2023-01-23 18:30:01 +01:00
parent 7bf7a13bb9
commit 530bb0a63c
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/user/user.go
View File

@ -419,7 +419,7 @@ func GetUserFromClaims(claims jwt.MapClaims) (user *User, err error) {
}
// UpdateUser updates a user
func UpdateUser(s *xorm.Session, user *User) (updatedUser *User, err error) {
func UpdateUser(s *xorm.Session, user *User, forceOverride bool) (updatedUser *User, err error) {
// Check if it exists
theUser, err := GetUserWithEmail(s, &User{ID: user.ID})
@ -442,7 +442,7 @@ func UpdateUser(s *xorm.Session, user *User) (updatedUser *User, err error) {
}
// Check if we have a name
if user.Name == "" {
if user.Name == "" && !forceOverride {
user.Name = theUser.Name
}