-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix template error when comment review doesn't exist (#29888)
Fix #29885
- Loading branch information
1 parent
0e183d8
commit 828701f
Showing
8 changed files
with
258 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,72 @@ | ||
| {{$resolved := (index .comments 0).IsResolved}} | ||
| {{$invalid := (index .comments 0).Invalidated}} | ||
| {{$resolveDoer := (index .comments 0).ResolveDoer}} | ||
| {{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}} | ||
| {{$referenceUrl := printf "%s#%s" $.Issue.Link (index .comments 0).HashTag}} | ||
| <div class="conversation-holder" data-path="{{(index .comments 0).TreePath}}" data-side="{{if lt (index .comments 0).Line 0}}left{{else}}right{{end}}" data-idx="{{(index .comments 0).UnsignedLine}}"> | ||
| {{if $resolved}} | ||
| <div class="ui attached header resolved-placeholder gt-df gt-ac gt-sb"> | ||
| <div class="ui grey text gt-df gt-ac gt-fw gt-gap-2"> | ||
| {{svg "octicon-check" 16 "icon gt-mr-2"}} | ||
| <b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}} | ||
| {{if $invalid}} | ||
| <!-- | ||
| We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above). | ||
| The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl | ||
| --> | ||
| <a href="{{$referenceUrl}}" class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> | ||
| {{ctx.Locale.Tr "repo.issues.review.outdated"}} | ||
| </a> | ||
| {{end}} | ||
| {{if len .comments}} | ||
| {{$comment := index .comments 0}} | ||
| {{$resolved := $comment.IsResolved}} | ||
| {{$invalid := $comment.Invalidated}} | ||
| {{$resolveDoer := $comment.ResolveDoer}} | ||
| {{$hasReview := and $comment.Review}} | ||
| {{$isReviewPending := and $hasReview (eq $comment.Review.Type 0)}} | ||
| {{$referenceUrl := printf "%s#%s" $.Issue.Link $comment.HashTag}} | ||
| <div class="conversation-holder" data-path="{{$comment.TreePath}}" data-side="{{if lt $comment.Line 0}}left{{else}}right{{end}}" data-idx="{{$comment.UnsignedLine}}"> | ||
| {{if $resolved}} | ||
| <div class="ui attached header resolved-placeholder gt-df gt-ac gt-sb"> | ||
| <div class="ui grey text gt-df gt-ac gt-fw gt-gap-2"> | ||
| {{svg "octicon-check" 16 "icon gt-mr-2"}} | ||
| <b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}} | ||
| {{if $invalid}} | ||
| <!-- | ||
| We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above). | ||
| The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl | ||
| --> | ||
| <a href="{{$referenceUrl}}" class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> | ||
| {{ctx.Locale.Tr "repo.issues.review.outdated"}} | ||
| </a> | ||
| {{end}} | ||
| </div> | ||
| <div class="gt-df gt-ac gt-gap-3"> | ||
| <button id="show-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button show-outdated gt-df gt-ac"> | ||
| {{svg "octicon-unfold" 16 "gt-mr-3"}} | ||
| {{ctx.Locale.Tr "repo.issues.review.show_resolved"}} | ||
| </button> | ||
| <button id="hide-outdated-{{$comment.ID}}" data-comment="{{$comment.ID}}" class="ui tiny labeled button hide-outdated gt-df gt-ac gt-hidden"> | ||
| {{svg "octicon-fold" 16 "gt-mr-3"}} | ||
| {{ctx.Locale.Tr "repo.issues.review.hide_resolved"}} | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <div class="gt-df gt-ac gt-gap-3"> | ||
| <button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button show-outdated gt-df gt-ac"> | ||
| {{svg "octicon-unfold" 16 "gt-mr-3"}} | ||
| {{ctx.Locale.Tr "repo.issues.review.show_resolved"}} | ||
| </button> | ||
| <button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button hide-outdated gt-df gt-ac gt-hidden"> | ||
| {{svg "octicon-fold" 16 "gt-mr-3"}} | ||
| {{ctx.Locale.Tr "repo.issues.review.hide_resolved"}} | ||
| </button> | ||
| {{end}} | ||
| <div id="code-comments-{{$comment.ID}}" class="field comment-code-cloud {{if $resolved}}gt-hidden{{end}}"> | ||
| <div class="comment-list"> | ||
| <ui class="ui comments"> | ||
| {{template "repo/diff/comments" dict "root" $ "comments" .comments}} | ||
| </ui> | ||
| </div> | ||
| </div> | ||
| {{end}} | ||
| <div id="code-comments-{{(index .comments 0).ID}}" class="field comment-code-cloud {{if $resolved}}gt-hidden{{end}}"> | ||
| <div class="comment-list"> | ||
| <ui class="ui comments"> | ||
| {{template "repo/diff/comments" dict "root" $ "comments" .comments}} | ||
| </ui> | ||
| </div> | ||
| <div class="gt-df gt-je gt-ac gt-fw gt-mt-3"> | ||
| <div class="ui buttons gt-mr-2"> | ||
| <button class="ui icon tiny basic button previous-conversation"> | ||
| {{svg "octicon-arrow-up" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.previous"}} | ||
| </button> | ||
| <button class="ui icon tiny basic button next-conversation"> | ||
| {{svg "octicon-arrow-down" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.next"}} | ||
| </button> | ||
| <div class="gt-df gt-je gt-ac gt-fw gt-mt-3"> | ||
| <div class="ui buttons gt-mr-2"> | ||
| <button class="ui icon tiny basic button previous-conversation"> | ||
| {{svg "octicon-arrow-up" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.previous"}} | ||
| </button> | ||
| <button class="ui icon tiny basic button next-conversation"> | ||
| {{svg "octicon-arrow-down" 12 "icon"}} {{ctx.Locale.Tr "repo.issues.next"}} | ||
| </button> | ||
| </div> | ||
| {{if and $.CanMarkConversation $hasReview (not $isReviewPending)}} | ||
| <button class="ui icon tiny basic button resolve-conversation" data-origin="diff" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{$comment.ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation"> | ||
| {{if $resolved}} | ||
| {{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}} | ||
| {{else}} | ||
| {{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}} | ||
| {{end}} | ||
| </button> | ||
| {{end}} | ||
| {{if and $.SignedUserID (not $.Repository.IsArchived)}} | ||
| <button class="comment-form-reply ui primary tiny labeled icon button gt-ml-2 gt-mr-0"> | ||
| {{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}} | ||
| </button> | ||
| {{end}} | ||
| </div> | ||
| {{if and $.CanMarkConversation $isNotPending}} | ||
| <button class="ui icon tiny basic button resolve-conversation" data-origin="diff" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index .comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation"> | ||
| {{if $resolved}} | ||
| {{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}} | ||
| {{else}} | ||
| {{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}} | ||
| {{end}} | ||
| </button> | ||
| {{end}} | ||
| {{if and $.SignedUserID (not $.Repository.IsArchived)}} | ||
| <button class="comment-form-reply ui primary tiny labeled icon button gt-ml-2 gt-mr-0"> | ||
| {{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}} | ||
| </button> | ||
| {{end}} | ||
| {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" $comment.ReviewID "root" $ "comment" $comment}} | ||
| </div> | ||
| {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}} | ||
| </div> | ||
| </div> | ||
| {{else}} | ||
| {{template "repo/diff/conversation_outdated"}} | ||
| {{end}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.