diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2021-10-13 02:11:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-12 20:11:35 +0200 |
commit | 7bcbdd07072d375eb9f24a64a047879ae2aa7aed (patch) | |
tree | 39ec57de914d4ccb05395ee991b94f6bca90dedb /modules/context | |
parent | d0a681fbc3fb626adcddbbb13f8c96c0bbd72c02 (diff) | |
download | gitea-7bcbdd07072d375eb9f24a64a047879ae2aa7aed.tar.gz gitea-7bcbdd07072d375eb9f24a64a047879ae2aa7aed.zip |
Add user status filter to admin user management page (#16770)
It makes Admin's life easier to filter users by various status.
* introduce window.config.PageData to pass template data to javascript module and small refactor
move legacy window.ActivityTopAuthors to window.config.PageData.ActivityTopAuthors
make HTML structure more IDE-friendly in footer.tmpl and head.tmpl
remove incorrect <style class="list-search-style"></style> in head.tmpl
use log.Error instead of log.Critical in admin user search
* use LEFT JOIN instead of SubQuery when admin filters users by 2fa. revert non-en locale.
* use OptionalBool instead of status map
* refactor SearchUserOptions.toConds to SearchUserOptions.toSearchQueryBase
* add unit test for user search
* only allow admin to use filters to search users
Diffstat (limited to 'modules/context')
-rw-r--r-- | modules/context/context.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/context/context.go b/modules/context/context.go index bed4760322..2076ef82ab 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -48,10 +48,11 @@ type Render interface { // Context represents context of a request. type Context struct { - Resp ResponseWriter - Req *http.Request - Data map[string]interface{} - Render Render + Resp ResponseWriter + Req *http.Request + Data map[string]interface{} // data used by MVC templates + PageData map[string]interface{} // data used by JavaScript modules in one page + Render Render translation.Locale Cache cache.Cache csrf CSRF @@ -646,6 +647,9 @@ func Contexter() func(next http.Handler) http.Handler { "Link": link, }, } + // PageData is passed by reference, and it will be rendered to `window.config.PageData` in `head.tmpl` for JavaScript modules + ctx.PageData = map[string]interface{}{} + ctx.Data["PageData"] = ctx.PageData ctx.Req = WithContext(req, &ctx) ctx.csrf = Csrfer(csrfOpts, &ctx) |