diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-08 21:15:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-08 21:15:22 +0800 |
| commit | fdbd64611383f8b78dc76765f6edfa3e40a3a0bf (patch) | |
| tree | dae3fa75aeaf28a8abd9565fb544ae8b72d9e530 /routers/web | |
| parent | cf5a281fdc23543584a3a06fcfcf796b08425a79 (diff) | |
| download | gitea-fdbd64611383f8b78dc76765f6edfa3e40a3a0bf.tar.gz gitea-fdbd64611383f8b78dc76765f6edfa3e40a3a0bf.zip | |
Group template helper functions, remove `Printf`, improve template error messages (#23982)
Follow #23328
Major changes:
* Group the function in `templates/help.go` by their purposes. It could
make future work easier.
* Remove the `Printf` helper function, there is already a builtin
`printf`.
* Remove `DiffStatsWidth`, replace with `Eval` in template
* Rename the `NewTextFuncMap` to `mailSubjectTextFuncMap`, it's for
subject text template only, no need to make it support HTML functions.
----
And fine tune template error messages, to make it more friendly to
developers and users.
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'routers/web')
| -rw-r--r-- | routers/web/auth/oauth.go | 11 | ||||
| -rw-r--r-- | routers/web/swagger_json.go | 14 |
2 files changed, 14 insertions, 11 deletions
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 7de63dbe94..b3c4a234c1 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -578,12 +578,15 @@ func GrantApplicationOAuth(ctx *context.Context) { // OIDCWellKnown generates JSON so OIDC clients know Gitea's capabilities func OIDCWellKnown(ctx *context.Context) { - t := ctx.Render.TemplateLookup("user/auth/oidc_wellknown") + t, err := ctx.Render.TemplateLookup("user/auth/oidc_wellknown") + if err != nil { + ctx.ServerError("unable to find template", err) + return + } ctx.Resp.Header().Set("Content-Type", "application/json") ctx.Data["SigningKey"] = oauth2.DefaultSigningKey - if err := t.Execute(ctx.Resp, ctx.Data); err != nil { - log.Error("%v", err) - ctx.Error(http.StatusInternalServerError) + if err = t.Execute(ctx.Resp, ctx.Data); err != nil { + ctx.ServerError("unable to execute template", err) } } diff --git a/routers/web/swagger_json.go b/routers/web/swagger_json.go index 2d626c558e..1844b90d95 100644 --- a/routers/web/swagger_json.go +++ b/routers/web/swagger_json.go @@ -4,11 +4,8 @@ package web import ( - "net/http" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/log" ) // tplSwaggerV1Json swagger v1 json template @@ -16,10 +13,13 @@ const tplSwaggerV1Json base.TplName = "swagger/v1_json" // SwaggerV1Json render swagger v1 json func SwaggerV1Json(ctx *context.Context) { - t := ctx.Render.TemplateLookup(string(tplSwaggerV1Json)) + t, err := ctx.Render.TemplateLookup(string(tplSwaggerV1Json)) + if err != nil { + ctx.ServerError("unable to find template", err) + return + } ctx.Resp.Header().Set("Content-Type", "application/json") - if err := t.Execute(ctx.Resp, ctx.Data); err != nil { - log.Error("%v", err) - ctx.Error(http.StatusInternalServerError) + if err = t.Execute(ctx.Resp, ctx.Data); err != nil { + ctx.ServerError("unable to execute template", err) } } |