troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 14:49:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[MODERATION] Fix unblock action (squash)

Browse source 
- Pass the whole context instead of only giving pieces.
- This fixes CSRF not correctly being inserted into the unblock buttons.

(cherry picked from commit 2aa51922ba)
(cherry picked from commit 7ee8db0f01)
(cherry picked from commit e4f8b999bc)
(cherry picked from commit 05aea60b13)
(cherry picked from commit dc0d61b012)
(cherry picked from commit f53fa583de)
This commit is contained in:
Gusted 2023-09-17 19:32:02 +02:00 committed by Earl Warren
parent e0187b21fe
commit f3d129247e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/org/settings/blocked_users.tmpl
View file

@ -15,7 +15,7 @@
</form>
</div>
<div class="ui attached segment">
{{template "shared/blocked_users_list" dict "locale" .locale "BlockedUsers" .BlockedUsers}}
{{template "shared/blocked_users_list" .}}
</div>
</div>
{{template "org/settings/layout_footer" .}}

2
templates/user/settings/blocked_users.tmpl
View file

@ -4,7 +4,7 @@
{{.locale.Tr "settings.blocked_users"}}
</h4>
<div class="ui attached segment">
{{template "shared/blocked_users_list" dict "locale" .locale "BlockedUsers" .BlockedUsers}}
{{template "shared/blocked_users_list" .}}
</div>
</div>
{{template "user/settings/layout_footer" .}}