diff --git a/integrations/auth_ldap_test.go b/integrations/auth_ldap_test.go index 520a611eab136..15694584186d0 100644 --- a/integrations/auth_ldap_test.go +++ b/integrations/auth_ldap_test.go @@ -141,7 +141,7 @@ func TestLDAPUserSignin(t *testing.T) { assert.Equal(t, u.UserName, htmlDoc.GetInputValueByName("name")) assert.Equal(t, u.FullName, htmlDoc.GetInputValueByName("full_name")) - assert.Equal(t, u.Email, htmlDoc.GetInputValueByName("email")) + assert.Equal(t, u.Email, htmlDoc.Find(`label[for="email"]`).Siblings().First().Text()) } func TestLDAPUserSync(t *testing.T) { diff --git a/integrations/html_helper.go b/integrations/html_helper.go index 823ed44851532..6dc806a76ed26 100644 --- a/integrations/html_helper.go +++ b/integrations/html_helper.go @@ -37,6 +37,13 @@ func (doc *HTMLDoc) GetInputValueByName(name string) string { return text } +// Find gets the descendants of each element in the current set of +// matched elements, filtered by a selector. It returns a new Selection +// object containing these matched elements. +func (doc *HTMLDoc) Find(selector string) *goquery.Selection { + return doc.doc.Find(selector) +} + // GetCSRF for get CSRC token value from input func (doc *HTMLDoc) GetCSRF() string { return doc.GetInputValueByName("_csrf") diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index e657f78e6de47..32fde1570ead2 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -199,7 +199,6 @@ func (f *AccessTokenForm) Validate(ctx *macaron.Context, errs binding.Errors) bi type UpdateProfileForm struct { Name string `binding:"AlphaDashDot;MaxSize(40)"` FullName string `binding:"MaxSize(100)"` - Email string `binding:"Required;Email;MaxSize(254)"` KeepEmailPrivate bool Website string `binding:"ValidUrl;MaxSize(255)"` Location string `binding:"MaxSize(50)"` diff --git a/routers/user/setting/profile.go b/routers/user/setting/profile.go index edb78031f2b34..6653230a39429 100644 --- a/routers/user/setting/profile.go +++ b/routers/user/setting/profile.go @@ -91,7 +91,6 @@ func ProfilePost(ctx *context.Context, form auth.UpdateProfileForm) { } ctx.User.FullName = form.FullName - ctx.User.Email = form.Email ctx.User.KeepEmailPrivate = form.KeepEmailPrivate ctx.User.Website = form.Website ctx.User.Location = form.Location diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 1f34e24585d6d..ea895ecd894f9 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -21,9 +21,9 @@ -
{{.SignedUser.Email}}