Merge branch 'main' into fix-doc

lunny · web-flow · commit 9dd318b9de03 · 2022-01-12T23:47:05.000+08:00
diff --git a/models/user/user.go b/models/user/user.go
@@ -855,7 +855,7 @@ func updateUser(ctx context.Context, u *User, changePrimaryEmail bool) error {
 			if _, err := e.Insert(&emailAddress); err != nil {
 				return err
 			}
-		} else if _, err := e.ID(emailAddress).Cols("is_primary").Update(&EmailAddress{
+		} else if _, err := e.ID(emailAddress.ID).Cols("is_primary").Update(&EmailAddress{
 			IsPrimary: true,
 		}); err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ func updateUser(ctx context.Context, u *User, changePrimaryEmail bool) error {`
`855`	`855`	`if _, err := e.Insert(&emailAddress); err != nil {`
`856`	`856`	`return err`
`857`	`857`	`}`
`858`		`- } else if _, err := e.ID(emailAddress).Cols("is_primary").Update(&EmailAddress{`
	`858`	`+ } else if _, err := e.ID(emailAddress.ID).Cols("is_primary").Update(&EmailAddress{`
`859`	`859`	`IsPrimary: true,`
`860`	`860`	`}); err != nil {`
`861`	`861`	`return err`