mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-05-28 21:28:30 +00:00
747be949a1
- Ensure that the doer and blocked user cannot add each other as collaborators to repositories. - The Web UI gets an detailed message of the specific situation, the API gets an generic Forbidden code. - Unit tests has been added. - Integration testing for Web and API has been added. - This commit doesn't introduce removing each other as collaborators on the block action, due to the complexity of database calls that needs to be figured out. That deserves its own commit and test code.
62 lines
1.9 KiB
Handlebars
62 lines
1.9 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content user profile">
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<div class="ui stackable grid">
|
|
<div class="ui four wide column">
|
|
{{template "shared/user/profile_big_avatar" .}}
|
|
</div>
|
|
<div class="ui twelve wide column">
|
|
<div class="gt-mb-4">
|
|
{{template "user/overview/header" .}}
|
|
</div>
|
|
|
|
{{if eq .TabName "activity"}}
|
|
{{if .ContextUser.KeepActivityPrivate}}
|
|
<div class="ui info message">
|
|
<p>{{.locale.Tr "user.disabled_public_activity"}}</p>
|
|
</div>
|
|
{{end}}
|
|
{{template "user/heatmap" .}}
|
|
<div class="feeds">
|
|
{{template "user/dashboard/feeds" .}}
|
|
</div>
|
|
{{else if eq .TabName "stars"}}
|
|
<div class="stars">
|
|
{{template "explore/repo_search" .}}
|
|
{{template "explore/repo_list" .}}
|
|
{{template "base/paginate" .}}
|
|
</div>
|
|
{{else if eq .TabName "following"}}
|
|
{{template "repo/user_cards" .}}
|
|
{{else if eq .TabName "followers"}}
|
|
{{template "repo/user_cards" .}}
|
|
{{else if eq .TabName "overview"}}
|
|
<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
|
|
{{else}}
|
|
{{template "explore/repo_search" .}}
|
|
{{template "explore/repo_list" .}}
|
|
{{template "base/paginate" .}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui small basic delete modal" id="block-user">
|
|
<div class="ui icon header">
|
|
{{svg "octicon-blocked" 16 "blocked inside"}}
|
|
{{$.locale.Tr "user.block_user"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "user.block_user.detail"}}</p>
|
|
<ul>
|
|
<li>{{$.locale.Tr "user.block_user.detail_1"}}</li>
|
|
<li>{{$.locale.Tr "user.block_user.detail_2"}}</li>
|
|
<li>{{$.locale.Tr "user.block_user.detail_3"}}</li>
|
|
</ul>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|