TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use correct user when determining max repo limits for error messages (#18153)

Browse source 
- Use the correct user(`owner` instead of `ctx.User`) to get the maxCreationLimit.
This commit is contained in:
Gusted 2022-01-02 02:38:07 +00:00 • committed by GitHub
parent 5d4ee44ed3
commit 88da7a7174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/web/repo/migrate.go
View file

@ -82,7 +82,7 @@ func handleMigrateError(ctx *context.Context, owner *user_model.User, err error,
ctx.RenderWithErr(ctx.Tr("form.2fa_auth_required"), tpl, form) ctx.RenderWithErr(ctx.Tr("form.2fa_auth_required"), tpl, form)
case repo_model.IsErrReachLimitOfRepo(err): case repo_model.IsErrReachLimitOfRepo(err):
var msg string var msg string
maxCreationLimit := ctx.User.MaxCreationLimit() maxCreationLimit := owner.MaxCreationLimit()
if maxCreationLimit == 1 { if maxCreationLimit == 1 {
msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit) msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit)
} else { } else {

2
routers/web/repo/repo.go
View file

@ -163,7 +163,7 @@ func handleCreateError(ctx *context.Context, owner *user_model.User, err error,
switch { switch {
case repo_model.IsErrReachLimitOfRepo(err): case repo_model.IsErrReachLimitOfRepo(err):
var msg string var msg string
maxCreationLimit := ctx.User.MaxCreationLimit() maxCreationLimit := owner.MaxCreationLimit()
if maxCreationLimit == 1 { if maxCreationLimit == 1 {
msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit) msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit)
} else { } else {

2
routers/web/repo/setting.go
View file

@ -609,7 +609,7 @@ func SettingsPost(ctx *context.Context) {
} }
if !ctx.Repo.Owner.CanCreateRepo() { if !ctx.Repo.Owner.CanCreateRepo() {
maxCreationLimit := ctx.User.MaxCreationLimit() maxCreationLimit := ctx.Repo.Owner.MaxCreationLimit()
if maxCreationLimit == 1 { if maxCreationLimit == 1 {
ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit)) ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit))
} else { } else {