From 1d275c1748a75a01c270f5c306c5248808016aba Mon Sep 17 00:00:00 2001 From: Yarden Shoham <git@yardenshoham.com> Date: Sat, 17 Feb 2024 17:01:25 +0200 Subject: [PATCH] Fix labels referencing the wrong ID in the user profile settings (#29199) 2 instances of `for` with a wrong value and 1 `for` that had a reference to a `name` instead of `id`. --------- Signed-off-by: Yarden Shoham <git@yardenshoham.com> --- templates/user/settings/profile.tmpl | 12 ++++++------ tests/integration/auth_ldap_test.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 1f32aed0e8..d1c68656b6 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -22,8 +22,8 @@ <input id="full_name" name="full_name" value="{{.SignedUser.FullName}}" maxlength="100"> </div> <div class="field {{if .Err_Email}}error{{end}}"> - <label for="email">{{ctx.Locale.Tr "email"}}</label> - <p>{{.SignedUser.Email}}</p> + <label>{{ctx.Locale.Tr "email"}}</label> + <p id="signed-user-email">{{.SignedUser.Email}}</p> </div> <div class="field {{if .Err_Description}}error{{end}}"> <label for="description">{{ctx.Locale.Tr "user.user_bio"}}</label> @@ -42,11 +42,11 @@ <!-- private block --> <div class="field" id="privacy-user-settings"> - <label for="security-private"><strong>{{ctx.Locale.Tr "settings.privacy"}}</strong></label> + <label><strong>{{ctx.Locale.Tr "settings.privacy"}}</strong></label> </div> <div class="inline field {{if .Err_Visibility}}error{{end}}"> - <span class="inline required field"><label for="visibility">{{ctx.Locale.Tr "settings.visibility"}}</label></span> + <span class="inline required field"><label>{{ctx.Locale.Tr "settings.visibility"}}</label></span> <div class="ui selection type dropdown"> {{if .SignedUser.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}} {{if .SignedUser.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}} @@ -120,8 +120,8 @@ </div> <div class="inline field gt-pl-4"> - <label for="avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label> - <input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp"> + <label for="new-avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label> + <input id="new-avatar" name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp"> </div> <div class="field"> diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 2d69dfcfd7..3a5fdb97a6 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -179,7 +179,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.Find(`label[for="email"]`).Siblings().First().Text()) + assert.Equal(t, u.Email, htmlDoc.Find("#signed-user-email").Text()) } func TestLDAPAuthChange(t *testing.T) {