Skip to content

Commit c9487b4

Browse files
committed
Ensure that /user/settings/blocked_users has the list of disabled features
1 parent a603ff4 commit c9487b4

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

routers/web/user/setting/block.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package setting
66
import (
77
"net/http"
88

9+
user_model "code.gitea.io/gitea/models/user"
910
"code.gitea.io/gitea/modules/base"
1011
"code.gitea.io/gitea/modules/setting"
1112
shared_user "code.gitea.io/gitea/routers/web/shared/user"
@@ -19,6 +20,7 @@ const (
1920
func BlockedUsers(ctx *context.Context) {
2021
ctx.Data["Title"] = ctx.Tr("user.block.list")
2122
ctx.Data["PageIsSettingsBlockedUsers"] = true
23+
ctx.Data["UserDisabledFeatures"] = user_model.DisabledFeaturesWithLoginType(ctx.Doer)
2224

2325
shared_user.BlockedUsers(ctx, ctx.Doer)
2426
if ctx.Written() {

tests/integration/user_settings_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,3 +392,14 @@ func TestUserSettingsRepos(t *testing.T) {
392392

393393
assertNavbar(t, doc)
394394
}
395+
396+
func TestUserSettingsBlockedUsers(t *testing.T) {
397+
defer tests.PrepareTestEnv(t)()
398+
399+
session := loginUser(t, "user2")
400+
req := NewRequest(t, "GET", "/user/settings/blocked_users")
401+
resp := session.MakeRequest(t, req, http.StatusOK)
402+
doc := NewHTMLParser(t, resp.Body)
403+
404+
assertNavbar(t, doc)
405+
}

0 commit comments

Comments
 (0)