Skip to content

Commit bd8a253

Browse files
yp05327yp05327
authored
Improve show role (#26621)
Add a general show role template.
1 parent 7934602 commit bd8a253

File tree

3 files changed

+23
-61
lines changed

3 files changed

+23
-61
lines changed

‎templates/repo/issue/view_content.tmpl

+1-12
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,7 @@
4444
{{end}}
4545
</div>
4646
<div class="comment-header-right actions gt-df gt-ac">
47-
{{if gt .Issue.ShowRole 0}}
48-
{{if (.Issue.ShowRole.HasRole "Writer")}}
49-
<div class="ui basic label role-label">
50-
{{$.locale.Tr "repo.issues.collaborator"}}
51-
</div>
52-
{{end}}
53-
{{if (.Issue.ShowRole.HasRole "Owner")}}
54-
<div class="ui basic label role-label">
55-
{{$.locale.Tr "repo.issues.owner"}}
56-
</div>
57-
{{end}}
58-
{{end}}
47+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .Issue.ShowRole "IgnorePoster" true}}
5948
{{if not $.Repository.IsArchived}}
6049
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}}
6150
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" .Issue "delete" false "issue" true "diff" false "IsCommentPoster" $.IsIssuePoster}}

‎templates/repo/issue/view_content/comments.tmpl

+7-49
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,7 @@
5050
{{end}}
5151
</div>
5252
<div class="comment-header-right actions gt-df gt-ac">
53-
{{if (.ShowRole.HasRole "Poster")}}
54-
<div class="ui basic label">
55-
{{$.locale.Tr "repo.issues.poster"}}
56-
</div>
57-
{{end}}
58-
{{if (.ShowRole.HasRole "Writer")}}
59-
<div class="ui basic label">
60-
{{$.locale.Tr "repo.issues.collaborator"}}
61-
</div>
62-
{{end}}
63-
{{if (.ShowRole.HasRole "Owner")}}
64-
<div class="ui basic label">
65-
{{$.locale.Tr "repo.issues.owner"}}
66-
</div>
67-
{{end}}
53+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
6854
{{if not $.Repository.IsArchived}}
6955
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
7056
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
@@ -442,25 +428,11 @@
442428
</span>
443429
</div>
444430
<div class="comment-header-right actions gt-df gt-ac">
445-
{{if (.ShowRole.HasRole "Poster")}}
446-
<div class="ui basic label">
447-
{{$.locale.Tr "repo.issues.poster"}}
448-
</div>
449-
{{end}}
450-
{{if (.ShowRole.HasRole "Writer")}}
451-
<div class="ui basic label">
452-
{{$.locale.Tr "repo.issues.collaborator"}}
453-
</div>
454-
{{end}}
455-
{{if (.ShowRole.HasRole "Owner")}}
456-
<div class="ui basic label">
457-
{{$.locale.Tr "repo.issues.owner"}}
458-
</div>
459-
{{end}}
460-
{{if not $.Repository.IsArchived}}
461-
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
462-
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" false "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
463-
{{end}}
431+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
432+
{{if not $.Repository.IsArchived}}
433+
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
434+
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" false "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
435+
{{end}}
464436
</div>
465437
</div>
466438
<div class="ui attached segment comment-body">
@@ -567,21 +539,7 @@
567539
</span>
568540
</div>
569541
<div class="comment-header-right actions gt-df gt-ac">
570-
{{if (.ShowRole.HasRole "Poster")}}
571-
<div class="ui basic label">
572-
{{$.locale.Tr "repo.issues.poster"}}
573-
</div>
574-
{{end}}
575-
{{if (.ShowRole.HasRole "Writer")}}
576-
<div class="ui basic label">
577-
{{$.locale.Tr "repo.issues.collaborator"}}
578-
</div>
579-
{{end}}
580-
{{if (.ShowRole.HasRole "Owner")}}
581-
<div class="ui basic label">
582-
{{$.locale.Tr "repo.issues.owner"}}
583-
</div>
584-
{{end}}
542+
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
585543
{{if not $.Repository.IsArchived}}
586544
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
587545
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}

‎templates/repo/issue/view_content/show_role.tmpl

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{if and (.ShowRole.HasRole "Poster") (not .IgnorePoster)}}
2+
<div class="ui basic label role-label">
3+
{{ctx.Locale.Tr "repo.issues.poster"}}
4+
</div>
5+
{{end}}
6+
{{if (.ShowRole.HasRole "Writer")}}
7+
<div class="ui basic label role-label">
8+
{{ctx.Locale.Tr "repo.issues.collaborator"}}
9+
</div>
10+
{{end}}
11+
{{if (.ShowRole.HasRole "Owner")}}
12+
<div class="ui basic label role-label">
13+
{{ctx.Locale.Tr "repo.issues.owner"}}
14+
</div>
15+
{{end}}

0 commit comments

Comments
 (0)