From 27f39047c1e4c53facf99661c5ef820da92a9e65 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 2 Apr 2024 15:08:53 +0200 Subject: [PATCH] [BUG] Use correct template for commitmail error - Use the correct template that was given when there's an error in retrieving which git identity should be used. - Remove the error from the exception list. --- modules/testlogger/testlogger.go | 36 -------------------------------- routers/web/repo/editor.go | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go index acabad09ad..0229564e04 100644 --- a/modules/testlogger/testlogger.go +++ b/modules/testlogger/testlogger.go @@ -121,42 +121,6 @@ var ignoredErrorMessage = []string{ // TestRebuildCargo `RebuildCargoIndex() [E] RebuildIndex failed: GetRepositoryByOwnerAndName: repository does not exist [id: 0, uid: 0, owner_name: user2, name: _cargo-index]`, - // TestCommitMail/Delete/Not_activated - `:HTML() [E] Render failed: failed to render template: repo/editor/edit, error: template error: builtin(static):repo/editor/edit:13:13 : executing "repo/editor/edit" at : error calling len: reflect: call of reflect.Value.Type on zero Value ----------------------------------------------------------------------- - {{$n := len .TreeNames}} - ^ -----------------------------------------------------------------------`, - // TestCommitMail/Delete/Not_belong_to_user - `:HTML() [E] Render failed: failed to render template: repo/editor/edit, error: template error: builtin(static):repo/editor/edit:13:13 : executing "repo/editor/edit" at : error calling len: reflect: call of reflect.Value.Type on zero Value ----------------------------------------------------------------------- - {{$n := len .TreeNames}} - ^ -----------------------------------------------------------------------`, - // TestCommitMail/Apply_patch/Not_activated - `:HTML() [E] Render failed: failed to render template: repo/editor/edit, error: template error: builtin(static):repo/editor/edit:13:13 : executing "repo/editor/edit" at : error calling len: reflect: call of reflect.Value.Type on zero Value ----------------------------------------------------------------------- - {{$n := len .TreeNames}} - ^ -----------------------------------------------------------------------`, - // TestCommitMail/Apply_patch/Not_belong_to_user - `:HTML() [E] Render failed: failed to render template: repo/editor/edit, error: template error: builtin(static):repo/editor/edit:13:13 : executing "repo/editor/edit" at : error calling len: reflect: call of reflect.Value.Type on zero Value ----------------------------------------------------------------------- - {{$n := len .TreeNames}} - ^ -----------------------------------------------------------------------`, - // TestCommitMail/Cherry_pick/Not_activated - `:HTML() [E] Render failed: failed to render template: repo/editor/edit, error: template error: builtin(static):repo/editor/edit:13:13 : executing "repo/editor/edit" at : error calling len: reflect: call of reflect.Value.Type on zero Value ----------------------------------------------------------------------- - {{$n := len .TreeNames}} - ^ -----------------------------------------------------------------------`, - // TestCommitMail/Cherry_pick/Not_belong_to_user - `:HTML() [E] Render failed: failed to render template: repo/editor/edit, error: template error: builtin(static):repo/editor/edit:13:13 : executing "repo/editor/edit" at : error calling len: reflect: call of reflect.Value.Type on zero Value ----------------------------------------------------------------------- - {{$n := len .TreeNames}} - ^ -----------------------------------------------------------------------`, // TestDangerZoneConfirmation/Convert_fork/Fail `/gitea-repositories/user20/big_test_public_fork_7.git Error: no such file or directory`, // TestGitSmartHTTP diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index ea0c8ddb7e..e8439cb40e 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -950,7 +950,7 @@ func getGitIdentity(ctx *context.Context, commitMailID int64, tpl base.TplName, if email == nil || !email.IsActivated { ctx.Data["Err_CommitMailID"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.invalid_commit_mail"), tplEditFile, form) + ctx.RenderWithErr(ctx.Tr("repo.editor.invalid_commit_mail"), tpl, form) return nil }