diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-05-04 14:36:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-04 14:36:34 +0800 |
| commit | 5d77691d428d5302ee4df6c2a936b8e2ea9dca7e (patch) | |
| tree | 4fa6b13f2ae81c5de94d84f2288ae1f5653c011f /modules/web/middleware/flash.go | |
| parent | 75ea0d5dba5dbf2f84cef2d12460fdd566d43e62 (diff) | |
| download | gitea-5d77691d428d5302ee4df6c2a936b8e2ea9dca7e.tar.gz gitea-5d77691d428d5302ee4df6c2a936b8e2ea9dca7e.zip | |
Improve template system and panic recovery (#24461)
Partially for #24457
Major changes:
1. The old `signedUserNameStringPointerKey` is quite hacky, use
`ctx.Data[SignedUser]` instead
2. Move duplicate code from `Contexter` to `CommonTemplateContextData`
3. Remove incorrect copying&pasting code `ctx.Data["Err_Password"] =
true` in API handlers
4. Use one unique `RenderPanicErrorPage` for panic error page rendering
5. Move `stripSlashesMiddleware` to be the first middleware
6. Install global panic recovery handler, it works for both `install`
and `web`
7. Make `500.tmpl` only depend minimal template functions/variables,
avoid triggering new panics
Screenshot:
<details>
</details>
Diffstat (limited to 'modules/web/middleware/flash.go')
| -rw-r--r-- | modules/web/middleware/flash.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/web/middleware/flash.go b/modules/web/middleware/flash.go index f2d7cc692d..fa29ddeffc 100644 --- a/modules/web/middleware/flash.go +++ b/modules/web/middleware/flash.go @@ -18,7 +18,7 @@ var FlashNow bool // Flash represents a one time data transfer between two requests. type Flash struct { - DataStore + DataStore ContextDataStore url.Values ErrorMsg, WarningMsg, InfoMsg, SuccessMsg string } @@ -34,7 +34,7 @@ func (f *Flash) set(name, msg string, current ...bool) { } if isShow { - f.GetData()["Flash"] = f + f.DataStore.GetData()["Flash"] = f } else { f.Set(name, msg) } |