Don't update email for organisation (#18905) (#18906)

Gusted · web-flow · commit cea85c30a455 · 2022-02-26T03:10:21.000+01:00
Backport #18905
diff --git a/models/user/user.go b/models/user/user.go
@@ -861,7 +861,7 @@ func updateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...s
 		}); err != nil {
 			return err
 		}
-	} else { // check if primary email in email_address table
+	} else if !u.IsOrganization() { // check if primary email in email_address table
 		primaryEmailExist, err := e.Where("uid=? AND is_primary=?", u.ID, true).Exist(&EmailAddress{})
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ func updateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...s`
`861`	`861`	`}); err != nil {`
`862`	`862`	`return err`
`863`	`863`	`}`
`864`		`- } else { // check if primary email in email_address table`
	`864`	`+ } else if !u.IsOrganization() { // check if primary email in email_address table`
`865`	`865`	`primaryEmailExist, err := e.Where("uid=? AND is_primary=?", u.ID, true).Exist(&EmailAddress{})`
`866`	`866`	`if err != nil {`
`867`	`867`	`return err`