Skip to content

Commit 70174d7

Browse files
committed
rename error to avoid stutter
1 parent 1517217 commit 70174d7

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

routers/web/repo/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func handleActionError(ctx *context.Context, err error) {
309309
case errors.Is(err, user_model.ErrBlockedUser):
310310
ctx.Flash.Error(ctx.Tr("repo.action.blocked_user"))
311311
case repo_service.IsRepositoryLimitReached(err):
312-
limit := err.(repo_service.RepositoryLimitReachedError).Limit
312+
limit := err.(repo_service.LimitReachedError).Limit
313313
ctx.Flash.Error(ctx.TrN(limit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", limit))
314314
case errors.Is(err, util.ErrPermissionDenied):
315315
ctx.HTTPError(http.StatusNotFound)

routers/web/repo/setting/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ func handleSettingsPostTransfer(ctx *context.Context) {
885885
} else if repo_model.IsErrRepoTransferInProgress(err) {
886886
ctx.RenderWithErr(ctx.Tr("repo.settings.transfer_in_progress"), tplSettingsOptions, nil)
887887
} else if repo_service.IsRepositoryLimitReached(err) {
888-
limit := err.(repo_service.RepositoryLimitReachedError).Limit
888+
limit := err.(repo_service.LimitReachedError).Limit
889889
ctx.RenderWithErr(ctx.TrN(limit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", limit), tplSettingsOptions, nil)
890890
} else if errors.Is(err, user_model.ErrBlockedUser) {
891891
ctx.RenderWithErr(ctx.Tr("repo.settings.transfer.blocked_user"), tplSettingsOptions, nil)

services/repository/transfer.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import (
2525
notify_service "code.gitea.io/gitea/services/notify"
2626
)
2727

28-
type RepositoryLimitReachedError struct{ Limit int }
28+
type LimitReachedError struct{ Limit int }
2929

30-
func (RepositoryLimitReachedError) Error() string {
30+
func (LimitReachedError) Error() string {
3131
return "Repository limit has been reached"
3232
}
3333

3434
func IsRepositoryLimitReached(err error) bool {
35-
_, ok := err.(RepositoryLimitReachedError)
35+
_, ok := err.(LimitReachedError)
3636
return ok
3737
}
3838

@@ -63,7 +63,7 @@ func AcceptTransferOwnership(ctx context.Context, repo *repo_model.Repository, d
6363

6464
if !doer.IsAdmin && !repoTransfer.Recipient.CanCreateRepo() {
6565
limit := util.Iif(repoTransfer.Recipient.MaxRepoCreation >= 0, repoTransfer.Recipient.MaxRepoCreation, setting.Repository.MaxCreationLimit)
66-
return RepositoryLimitReachedError{Limit: limit}
66+
return LimitReachedError{Limit: limit}
6767
}
6868

6969
if !repoTransfer.CanUserAcceptOrRejectTransfer(ctx, doer) {
@@ -418,7 +418,7 @@ func StartRepositoryTransfer(ctx context.Context, doer, newOwner *user_model.Use
418418

419419
if !doer.IsAdmin && !newOwner.CanCreateRepo() {
420420
limit := util.Iif(newOwner.MaxRepoCreation >= 0, newOwner.MaxRepoCreation, setting.Repository.MaxCreationLimit)
421-
return RepositoryLimitReachedError{Limit: limit}
421+
return LimitReachedError{Limit: limit}
422422
}
423423

424424
var isDirectTransfer bool

0 commit comments

Comments
 (0)