mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

[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.
This commit is contained in:
Gusted 2024-04-02 15:08:53 +02:00
parent 68e900822b
commit 27f39047c1
No known key found for this signature in database
GPG Key ID: FD821B732837125F
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/testlogger/testlogger.go
View File

@ -121,42 +121,6 @@ var ignoredErrorMessage = []string{
// TestRebuildCargo // TestRebuildCargo
`RebuildCargoIndex() [E] RebuildIndex failed: GetRepositoryByOwnerAndName: repository does not exist [id: 0, uid: 0, owner_name: user2, name: _cargo-index]`, `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 <len .TreeNames>: 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 <len .TreeNames>: 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 <len .TreeNames>: 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 <len .TreeNames>: 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 <len .TreeNames>: 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 <len .TreeNames>: error calling len: reflect: call of reflect.Value.Type on zero Value
----------------------------------------------------------------------
{{$n := len .TreeNames}}
^
----------------------------------------------------------------------`,
// TestDangerZoneConfirmation/Convert_fork/Fail // TestDangerZoneConfirmation/Convert_fork/Fail
`/gitea-repositories/user20/big_test_public_fork_7.git Error: no such file or directory`, `/gitea-repositories/user20/big_test_public_fork_7.git Error: no such file or directory`,
// TestGitSmartHTTP // TestGitSmartHTTP

2
routers/web/repo/editor.go
View File

@ -950,7 +950,7 @@ func getGitIdentity(ctx *context.Context, commitMailID int64, tpl base.TplName,
if email == nil || !email.IsActivated { if email == nil || !email.IsActivated {
ctx.Data["Err_CommitMailID"] = true 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 return nil
} }