From ec127440b86cb5fcf51799d8bd76a9fd6b9cebcc Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sun, 17 Sep 2023 19:32:02 +0200
Subject: [PATCH] [MODERATION] Fix unblock action (squash)

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

(cherry picked from commit 2aa51922ba6a0ea2f8644277baa74fc8f34ab95a)
(cherry picked from commit 7ee8db0f018340bc97f125415503e3e5db5f5082)
(cherry picked from commit e4f8b999bcd3b68b3ef7f54f5b17c3ada0308121)
(cherry picked from commit 05aea60b1302bbd3ea574a9c6c34e1005a5d73bf)
(cherry picked from commit dc0d61b012cfaf2385f71e97cda5f220b58b9fa4)
(cherry picked from commit f53fa583de671ff60a0a1d0f3ab8c260e1ba4e1f)
(cherry picked from commit c65b89a58d11b32009c710c2f5e75f0cd3539395)
(cherry picked from commit 69e50b9969db3ab71cefaed520757876a9629a5c)
---
 templates/org/settings/blocked_users.tmpl  | 2 +-
 templates/user/settings/blocked_users.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl
index 4133a43c69..78c9025a83 100644
--- a/templates/org/settings/blocked_users.tmpl
+++ b/templates/org/settings/blocked_users.tmpl
@@ -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" .}}
diff --git a/templates/user/settings/blocked_users.tmpl b/templates/user/settings/blocked_users.tmpl
index b7a35311c5..07a371c5fb 100644
--- a/templates/user/settings/blocked_users.tmpl
+++ b/templates/user/settings/blocked_users.tmpl
@@ -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" .}}