Skip to content

Commit 532b1eb

Browse files
authored
Merge branch 'main' into submodule_nil_panic
2 parents 373d51a + a8c30a4 commit 532b1eb

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

options/locale/locale_en-US.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,9 @@ diff.review.header = Submit review
22652265
diff.review.placeholder = Review comment
22662266
diff.review.comment = Comment
22672267
diff.review.approve = Approve
2268+
diff.review.self_reject = Pull request authors can't request changes on their own pull request
22682269
diff.review.reject = Request changes
2270+
diff.review.self_approve = Pull request authors can't approve their own pull request
22692271
diff.committed_by = committed by
22702272
diff.protected = Protected
22712273
diff.image.side_by_side = Side by Side

templates/repo/diff/new_review.tmpl

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,22 @@
2222
</div>
2323
{{end}}
2424
<div class="ui divider"></div>
25-
<button type="submit" name="type" value="approve" {{if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID)}} disabled {{end}} class="ui submit green tiny button btn-submit">{{$.locale.Tr "repo.diff.review.approve"}}</button>
25+
{{$showSelfTooltip := (and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID))}}
26+
{{if $showSelfTooltip}}
27+
<span class="gt-dib tooltip" data-content="{{$.locale.Tr "repo.diff.review.self_approve"}}">
28+
<button type="submit" name="type" value="approve" disabled class="ui submit green tiny button btn-submit">{{$.locale.Tr "repo.diff.review.approve"}}</button>
29+
</span>
30+
{{else}}
31+
<button type="submit" name="type" value="approve" class="ui submit green tiny button btn-submit">{{$.locale.Tr "repo.diff.review.approve"}}</button>
32+
{{end}}
2633
<button type="submit" name="type" value="comment" class="ui submit tiny basic button btn-submit">{{$.locale.Tr "repo.diff.review.comment"}}</button>
27-
<button type="submit" name="type" value="reject" {{if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID)}} disabled {{end}} class="ui submit red tiny button btn-submit">{{$.locale.Tr "repo.diff.review.reject"}}</button>
34+
{{if $showSelfTooltip}}
35+
<span class="gt-dib tooltip" data-content="{{$.locale.Tr "repo.diff.review.self_reject"}}">
36+
<button type="submit" name="type" value="reject" disabled class="ui submit red tiny button btn-submit">{{$.locale.Tr "repo.diff.review.reject"}}</button>
37+
</span>
38+
{{else}}
39+
<button type="submit" name="type" value="reject" class="ui submit red tiny button btn-submit">{{$.locale.Tr "repo.diff.review.reject"}}</button>
40+
{{end}}
2841
</form>
2942
</div>
3043
</div>

0 commit comments

Comments
 (0)