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 /templates/base | |
| 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 'templates/base')
| -rw-r--r-- | templates/base/footer.tmpl | 5 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 25e163b19b..ead5630dae 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -1,8 +1,9 @@ -{{/* +{{if false}} + {{/* to make html structure "likely" complete to prevent IDE warnings */}} <html> <body> <div> -*/}} +{{end}} {{template "custom/body_inner_post" .}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 15f2826abf..817bdae288 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -26,6 +26,7 @@ <meta name="go-source" content="{{.GoGetImport}} _ {{.GoDocDirectory}} {{.GoDocFile}}"> {{end}} <script> + <!-- /* eslint-disable */ --> window.config = { AppVer: '{{AppVer}}', AppSubUrl: '{{AppSubUrl}}', @@ -33,6 +34,7 @@ CustomEmojis: {{CustomEmojis}}, UseServiceWorker: {{UseServiceWorker}}, csrf: '{{.CsrfToken}}', + PageData: {{ .PageData }}, HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}}, SimpleMDE: {{if .RequireSimpleMDE}}true{{else}}false{{end}}, Tribute: {{if .RequireTribute}}true{{else}}false{{end}}, @@ -75,7 +77,6 @@ .ui.secondary.menu .dropdown.item > .menu { margin-top: 0; } </style> </noscript> - <style class="list-search-style"></style> {{if .PageIsUserProfile}} <meta property="og:title" content="{{.Owner.Name}}" /> <meta property="og:type" content="profile" /> @@ -134,8 +135,10 @@ {{template "base/head_navbar" .}} </div><!-- end bar --> {{end}} -{{/* + +{{if false}} + {{/* to make html structure "likely" complete to prevent IDE warnings */}} </div> </body> </html> -*/}} +{{end}} |