mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-26 20:27:03 +01:00
b1f3069a22
- Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421) (cherry picked from commit37b4e6ef9b) (cherry picked from commitc17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c) (cherry picked from commit4743eaa6a0) (cherry picked from commiteff5b43d2e) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit9d359be5ed)
31 lines
1.1 KiB
Handlebars
31 lines
1.1 KiB
Handlebars
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings blocked_users")}}
|
|
<div class="user-setting-content">
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "settings.blocked_users"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<div class="ui blocked-user list gt-mt-0">
|
|
{{range .BlockedUsers}}
|
|
<div class="item gt-df gt-ac">
|
|
{{avatar $.Context . 28 "gt-mr-3"}}
|
|
<div class="gt-df gt-fc">
|
|
<a href="{{.HomeLink}}">{{.Name}}</a>
|
|
<i class="gt-mt-2">{{$.locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix) | Safe}}</i>
|
|
</div>
|
|
<div class="gt-ml-auto content">
|
|
<form action="{{$.Link}}/unblock" method="post">
|
|
{{$.CsrfTokenHtml}}
|
|
<input type="hidden" name="user_id" value="{{.ID}}">
|
|
<button class="ui red button">{{$.locale.Tr "user.unblock"}}</button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
{{else}}
|
|
<div class="item">
|
|
<span class="text grey italic">{{$.locale.Tr "settings.blocked_users_none"}}</span>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "user/settings/layout_footer" .}}
|