Sfoglia il codice sorgente

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

- Use the correct user(`owner` instead of `ctx.User`) to get the maxCreationLimit.
tags/v1.16.0-rc1
Gusted 2 anni fa
parent
commit
88da7a7174
Nessun account collegato all'indirizzo email del committer
3 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 1
    1
      routers/web/repo/migrate.go
  2. 1
    1
      routers/web/repo/repo.go
  3. 1
    1
      routers/web/repo/setting.go

+ 1
- 1
routers/web/repo/migrate.go Vedi 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)
case repo_model.IsErrReachLimitOfRepo(err):
var msg string
maxCreationLimit := ctx.User.MaxCreationLimit()
maxCreationLimit := owner.MaxCreationLimit()
if maxCreationLimit == 1 {
msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit)
} else {

+ 1
- 1
routers/web/repo/repo.go Vedi File

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

+ 1
- 1
routers/web/repo/setting.go Vedi File

@@ -609,7 +609,7 @@ func SettingsPost(ctx *context.Context) {
}

if !ctx.Repo.Owner.CanCreateRepo() {
maxCreationLimit := ctx.User.MaxCreationLimit()
maxCreationLimit := ctx.Repo.Owner.MaxCreationLimit()
if maxCreationLimit == 1 {
ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit))
} else {

Loading…
Annulla
Salva