mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 14:14:49 +03:00
cdf6318f51
- 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 commit217475385a
) (cherry picked from commitf2c38ce5c2
) (cherry picked from commit1edfb68137
) (cherry picked from commit2cbc12dc74
) (cherry picked from commit79ff020f18
)
40 lines
1.6 KiB
Handlebars
40 lines
1.6 KiB
Handlebars
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings blocked-users")}}
|
|
<div class="org-setting-content">
|
|
<div class="ui attached segment">
|
|
<form class="ui form ignore-dirty" id="block-user-form" action="{{$.Link}}/block" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="uid" value="">
|
|
<div class="inline field ui left">
|
|
<div id="search-user-box" class="ui search">
|
|
<div class="ui input">
|
|
<input class="prompt" name="uname" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" required>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<button type="submit" class="ui red button">{{.locale.Tr "user.block"}}</button>
|
|
</form>
|
|
</div>
|
|
<div class="ui bottom attached table segment blocked-users">
|
|
{{range .BlockedUsers}}
|
|
<div class="item gt-df gt-ac gt-fw">
|
|
{{avatar $.Context . 48 "gt-mr-3 gt-mb-0"}}
|
|
<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>
|
|
{{template "org/settings/layout_footer" .}}
|