2019-02-05 11:38:11 +00:00
|
|
|
{{ template "base/alert" }}
|
2017-03-17 05:57:43 +00:00
|
|
|
{{range .Issue.Comments}}
|
2017-12-11 04:37:04 +00:00
|
|
|
{{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }}
|
2017-03-17 05:57:43 +00:00
|
|
|
|
2019-02-18 20:55:04 +00:00
|
|
|
<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
|
2021-04-11 03:46:37 +00:00
|
|
|
5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING,
|
|
|
|
|
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
|
|
|
|
|
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
|
|
|
|
|
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
|
|
|
|
|
26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
|
|
|
|
|
29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
|
|
|
|
|
32 = DISMISSED_REVIEW -->
|
2017-03-17 05:57:43 +00:00
|
|
|
{{if eq .Type 0}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item comment" id="{{.HashTag}}">
|
2019-07-08 02:14:12 +00:00
|
|
|
{{if .OriginalAuthor }}
|
2021-05-21 17:03:27 +00:00
|
|
|
<span class="timeline-avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
|
2019-07-08 02:14:12 +00:00
|
|
|
{{else}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<a class="timeline-avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar .Poster}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
2019-07-08 02:14:12 +00:00
|
|
|
{{end}}
|
2020-11-07 23:15:09 +00:00
|
|
|
<div class="content comment-container">
|
2020-11-01 20:04:26 +00:00
|
|
|
<div class="ui top attached header comment-header df ac sb">
|
|
|
|
|
<div class="comment-header-left df ac">
|
2020-10-31 13:17:52 +00:00
|
|
|
{{if .OriginalAuthor }}
|
2020-11-05 19:34:04 +00:00
|
|
|
<span class="text black mr-2">
|
2021-09-18 16:22:51 +00:00
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
2020-11-05 19:34:04 +00:00
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
{{$.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} {{if $.Repository.OriginalURL}}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text migrate">
|
|
|
|
|
({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}
|
|
|
|
|
</span>
|
2020-10-31 13:17:52 +00:00
|
|
|
{{else}}
|
2020-11-05 19:34:04 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
|
|
|
|
|
{{.Poster.GetDisplayName}}
|
|
|
|
|
</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}
|
|
|
|
|
</span>
|
2020-10-31 13:17:52 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2020-11-01 20:04:26 +00:00
|
|
|
<div class="comment-header-right actions df ac">
|
2020-10-31 13:17:52 +00:00
|
|
|
{{if not $.Repository.IsArchived}}
|
2021-11-11 06:29:30 +00:00
|
|
|
{{if (.ShowRole.HasRole "Poster")}}
|
2020-10-21 23:47:16 +00:00
|
|
|
<div class="ui basic label">
|
2020-09-10 18:09:14 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.poster"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2021-11-11 06:29:30 +00:00
|
|
|
{{if (.ShowRole.HasRole "Writer")}}
|
2020-10-21 23:47:16 +00:00
|
|
|
<div class="ui basic label">
|
2021-11-11 06:29:30 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.collaborator"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Owner")}}
|
|
|
|
|
<div class="ui basic label">
|
|
|
|
|
{{$.i18n.Tr "repo.issues.owner"}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2019-12-27 23:43:56 +00:00
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
|
2021-01-17 17:29:10 +00:00
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
|
2020-10-31 13:17:52 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
2020-11-05 19:34:04 +00:00
|
|
|
<div class="ui attached segment comment-body">
|
2021-05-23 14:14:03 +00:00
|
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2019-11-19 18:33:42 +00:00
|
|
|
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
|
2019-10-15 12:19:32 +00:00
|
|
|
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
2021-04-11 03:46:37 +00:00
|
|
|
{{if .Attachments}}
|
|
|
|
|
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}}
|
|
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
2017-12-03 23:14:26 +00:00
|
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
|
|
|
{{if $reactions}}
|
|
|
|
|
<div class="ui attached segment reactions">
|
2019-12-27 23:43:56 +00:00
|
|
|
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
|
2017-12-03 23:14:26 +00:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 1}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-11-15 20:58:16 +00:00
|
|
|
<span class="badge bg-green text-white">{{svg "octicon-dot-fill"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-04-30 13:49:12 +00:00
|
|
|
{{if .Issue.IsPull }}
|
|
|
|
|
{{$.i18n.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
2020-04-19 00:15:07 +00:00
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 2}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-11-15 20:58:16 +00:00
|
|
|
<span class="badge bg-red text-white">{{svg "octicon-circle-slash"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-04-30 13:49:12 +00:00
|
|
|
{{if .Issue.IsPull }}
|
|
|
|
|
{{$.i18n.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
2020-04-19 00:15:07 +00:00
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
2020-04-14 01:06:23 +00:00
|
|
|
{{else if eq .Type 28}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-11-15 20:58:16 +00:00
|
|
|
<span class="badge bg-purple text-white">{{svg "octicon-git-merge"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2020-04-14 01:06:23 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-04-14 01:06:23 +00:00
|
|
|
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL $.Issue.PullRequest.MergedCommitID}}
|
2021-03-04 03:41:23 +00:00
|
|
|
{{if eq $.Issue.PullRequest.Status 3}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.manually_pull_merged_at" $link (ShortSha $.Issue.PullRequest.MergedCommitID) $.BaseTarget $createdStr | Str2html}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.pull_merged_at" $link (ShortSha $.Issue.PullRequest.MergedCommitID) $.BaseTarget $createdStr | Str2html}}
|
|
|
|
|
{{end}}
|
2020-04-14 01:06:23 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
2019-11-18 13:13:07 +00:00
|
|
|
{{else if eq .Type 3 5 6}}
|
|
|
|
|
{{ $refFrom:= "" }}
|
|
|
|
|
{{if ne .RefRepoID .Issue.RepoID}}
|
|
|
|
|
{{ $refFrom = $.i18n.Tr "repo.issues.ref_from" .RefRepo.FullName }}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{ $refTr := "repo.issues.ref_issue_from" }}
|
|
|
|
|
{{if .Issue.IsPull}}
|
|
|
|
|
{{ $refTr = "repo.issues.ref_pull_from" }}
|
|
|
|
|
{{else if eq .RefAction 1 }}
|
|
|
|
|
{{ $refTr = "repo.issues.ref_closing_from" }}
|
|
|
|
|
{{else if eq .RefAction 2 }}
|
|
|
|
|
{{ $refTr = "repo.issues.ref_reopening_from" }}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-bookmark"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-09-20 05:45:38 +00:00
|
|
|
</a>
|
|
|
|
|
{{if eq .RefAction 3}}<del>{{end}}
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2019-11-18 13:13:07 +00:00
|
|
|
{{$.i18n.Tr $refTr .EventTag $createdStr .RefCommentHTMLURL $refFrom | Safe}}
|
2019-09-20 05:45:38 +00:00
|
|
|
</span>
|
|
|
|
|
{{if eq .RefAction 3}}</del>{{end}}
|
|
|
|
|
|
|
|
|
|
<div class="detail">
|
2021-11-05 14:56:40 +00:00
|
|
|
<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
|
2019-09-20 05:45:38 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{else if eq .Type 4}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-bookmark"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}
|
|
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
<div class="detail">
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-git-commit"}}
|
2017-03-17 05:57:43 +00:00
|
|
|
<span class="text grey">{{.Content | Str2html}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 7}}
|
2020-10-25 21:49:48 +00:00
|
|
|
{{if or .AddedLabels .RemovedLabels}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-tag"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-10-25 21:49:48 +00:00
|
|
|
{{if and .AddedLabels (not .RemovedLabels)}}
|
|
|
|
|
{{$.i18n.Tr (TrN $.i18n.Lang (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels") (RenderLabels .AddedLabels) $createdStr | Safe}}
|
|
|
|
|
{{else if and (not .AddedLabels) .RemovedLabels}}
|
|
|
|
|
{{$.i18n.Tr (TrN $.i18n.Lang (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels") (RenderLabels .RemovedLabels) $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.add_remove_labels" (RenderLabels .AddedLabels) (RenderLabels .RemovedLabels) $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
2020-04-19 00:15:07 +00:00
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{else if eq .Type 8}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-milestone"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
|
|
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 9}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-person"}}</span>
|
2018-05-09 16:29:04 +00:00
|
|
|
{{if gt .AssigneeID 0}}
|
|
|
|
|
{{if .RemovedAssignee}}
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Assignee.HomeLink}}">
|
|
|
|
|
{{avatar .Assignee}}
|
2018-05-09 16:29:04 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author" href="{{.Assignee.HomeLink}}">{{.Assignee.GetDisplayName}}</a>
|
2019-01-19 19:16:46 +00:00
|
|
|
{{ if eq .Poster.ID .Assignee.ID }}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
|
|
|
|
|
{{ else }}
|
2019-05-08 08:41:35 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.remove_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
|
2019-01-19 19:16:46 +00:00
|
|
|
{{ end }}
|
2018-05-09 16:29:04 +00:00
|
|
|
</span>
|
|
|
|
|
{{else}}
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Assignee.HomeLink}}">
|
|
|
|
|
{{avatar .Assignee}}
|
2018-05-09 16:29:04 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author" href="{{.Assignee.HomeLink}}">{{.Assignee.GetDisplayName}}</a>
|
2018-05-09 16:29:04 +00:00
|
|
|
{{if eq .Poster.ID .AssigneeID}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
2019-05-08 08:41:35 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.add_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
|
2018-05-09 16:29:04 +00:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 10}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-pencil"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2018-02-18 20:06:37 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-08-24 01:44:53 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}}
|
2018-02-18 20:06:37 +00:00
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 11}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2018-02-18 20:06:37 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2021-02-08 03:09:14 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.delete_branch_at" (.OldRef|Escape) $createdStr | Safe}}
|
2018-02-18 20:06:37 +00:00
|
|
|
</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
2019-07-06 22:03:00 +00:00
|
|
|
{{else if eq .Type 12}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-09-12 06:48:13 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}
|
|
|
|
|
</span>
|
2017-09-12 06:48:13 +00:00
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 13}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-09-12 06:48:13 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}
|
|
|
|
|
</span>
|
2021-02-19 10:52:11 +00:00
|
|
|
{{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }}
|
2017-09-12 06:48:13 +00:00
|
|
|
<div class="detail">
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-clock"}}
|
2017-09-12 06:48:13 +00:00
|
|
|
<span class="text grey">{{.Content}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 14}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-09-12 06:48:13 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.add_time_history" $createdStr | Safe}}
|
|
|
|
|
</span>
|
2021-02-19 10:52:11 +00:00
|
|
|
{{ template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" . }}
|
2017-09-12 06:48:13 +00:00
|
|
|
<div class="detail">
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-clock"}}
|
2017-09-12 06:48:13 +00:00
|
|
|
<span class="text grey">{{.Content}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 15}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2017-09-12 06:48:13 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
|
|
|
|
|
</span>
|
2017-09-12 06:48:13 +00:00
|
|
|
</div>
|
2018-05-01 19:05:28 +00:00
|
|
|
{{else if eq .Type 16}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2018-05-01 19:05:28 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
|
2018-05-01 19:05:28 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 17}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2018-05-01 19:05:28 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
|
2018-05-01 19:05:28 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 18}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2018-05-01 19:05:28 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
|
2018-05-01 19:05:28 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
2018-07-17 21:23:58 +00:00
|
|
|
{{else if eq .Type 19}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.dependency.added_dependency" $createdStr | Safe}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</span>
|
2020-01-21 10:18:52 +00:00
|
|
|
{{if .DependentIssue}}
|
|
|
|
|
<div class="detail">
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-plus"}}
|
2020-01-21 10:18:52 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a href="{{.DependentIssue.HTMLURL}}">
|
|
|
|
|
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
|
|
|
|
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</a>
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</div>
|
2018-07-17 21:23:58 +00:00
|
|
|
{{else if eq .Type 20}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-package-dependents"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.dependency.removed_dependency" $createdStr | Safe}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</span>
|
2020-01-21 10:18:52 +00:00
|
|
|
{{if .DependentIssue}}
|
|
|
|
|
<div class="detail">
|
2021-03-22 04:04:19 +00:00
|
|
|
<span class="text grey">{{svg "octicon-trash"}}</span>
|
2020-01-21 10:18:52 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a href="{{.DependentIssue.HTMLURL}}">
|
|
|
|
|
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
|
|
|
|
|
#{{.DependentIssue.Index}} {{.DependentIssue.Title}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{.DependentIssue.Repo.FullName}}#{{.DependentIssue.Index}} - {{.DependentIssue.Title}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</a>
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2019-11-19 18:33:42 +00:00
|
|
|
</div>
|
2018-08-06 04:43:22 +00:00
|
|
|
{{else if eq .Type 22}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item-group">
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-01-23 17:28:15 +00:00
|
|
|
{{if .OriginalAuthor }}
|
|
|
|
|
{{else}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar .Poster}}
|
2020-04-10 22:01:41 +00:00
|
|
|
</a>
|
2020-01-23 17:28:15 +00:00
|
|
|
{{end}}
|
2020-12-17 15:52:58 +00:00
|
|
|
<span class="badge{{if eq .Review.Type 1}} bg-green text-white{{else if eq .Review.Type 3}} bg-red text-white{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span>
|
2020-04-10 22:01:41 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
{{if .OriginalAuthor }}
|
2021-09-18 16:22:51 +00:00
|
|
|
<span class="text black">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
|
|
|
|
<span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{else}}
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{end}}
|
2020-01-24 21:23:10 +00:00
|
|
|
|
2020-04-10 22:01:41 +00:00
|
|
|
{{if eq .Review.Type 1}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}}
|
|
|
|
|
{{else if eq .Review.Type 2}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
|
|
|
|
|
{{else if eq .Review.Type 3}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
2021-02-11 17:32:25 +00:00
|
|
|
{{if .Review.Dismissed}}
|
|
|
|
|
<div class="ui small label">{{$.i18n.Tr "repo.issues.review.dismissed_label"}}</div>
|
|
|
|
|
{{end}}
|
2020-04-10 22:01:41 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
2019-07-06 22:03:00 +00:00
|
|
|
{{if .Content}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item comment">
|
2020-11-07 23:15:09 +00:00
|
|
|
<div class="content comment-container">
|
|
|
|
|
<div class="ui top attached header comment-header df ac sb">
|
2020-04-10 22:01:41 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
{{if .OriginalAuthor }}
|
2021-09-18 16:22:51 +00:00
|
|
|
<span class="text black">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
|
|
|
|
<span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{else}}
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{end}}
|
|
|
|
|
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.left_comment" | Safe}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
2020-11-05 19:34:04 +00:00
|
|
|
<div class="ui attached segment comment-body">
|
2021-05-07 08:43:41 +00:00
|
|
|
<div class="render-content markup">
|
2020-04-28 18:05:39 +00:00
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
|
|
|
|
|
{{end}}
|
2020-04-10 22:01:41 +00:00
|
|
|
</div>
|
2021-06-15 01:12:33 +00:00
|
|
|
{{if .Attachments}}
|
|
|
|
|
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}}
|
|
|
|
|
{{end}}
|
2020-04-10 22:01:41 +00:00
|
|
|
</div>
|
2019-07-06 22:03:00 +00:00
|
|
|
</div>
|
2020-04-10 22:01:41 +00:00
|
|
|
</div>
|
2019-07-06 22:03:00 +00:00
|
|
|
{{end}}
|
2020-04-18 13:50:25 +00:00
|
|
|
|
2020-04-10 22:01:41 +00:00
|
|
|
{{if .Review.CodeComments}}
|
|
|
|
|
<div class="timeline-item event">
|
|
|
|
|
{{ range $filename, $lines := .Review.CodeComments}}
|
|
|
|
|
{{range $line, $comms := $lines}}
|
|
|
|
|
<div class="ui segments">
|
2021-06-27 15:21:19 +00:00
|
|
|
<div class="ui segment py-3 df ac sb word-break">
|
2020-04-10 22:01:41 +00:00
|
|
|
{{$invalid := (index $comms 0).Invalidated}}
|
2020-04-18 13:50:25 +00:00
|
|
|
{{$resolved := (index $comms 0).IsResolved}}
|
|
|
|
|
{{$resolveDoer := (index $comms 0).ResolveDoer}}
|
|
|
|
|
{{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}}
|
2021-03-31 22:19:53 +00:00
|
|
|
<div class="df ac">
|
|
|
|
|
<a href="{{(index $comms 0).CodeCommentURL}}" class="file-comment ml-3">{{$filename}}</a>
|
|
|
|
|
{{if $invalid }}
|
|
|
|
|
<span class="ui label basic small ml-3">
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.outdated"}}
|
|
|
|
|
</span>
|
2020-04-18 13:50:25 +00:00
|
|
|
{{end}}
|
2021-03-31 22:19:53 +00:00
|
|
|
</div>
|
|
|
|
|
<div>
|
|
|
|
|
{{if or $invalid $resolved}}
|
|
|
|
|
<button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if not $resolved}}hide {{end}}ui compact right labeled button show-outdated df ac">
|
|
|
|
|
{{svg "octicon-unfold" 16 "mr-3"}}
|
|
|
|
|
{{if $resolved}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.show_resolved"}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.show_outdated"}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
<button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="{{if $resolved}}hide {{end}}ui compact right labeled button hide-outdated df ac">
|
|
|
|
|
{{svg "octicon-fold" 16 "mr-3"}}
|
|
|
|
|
{{if $resolved}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.hide_resolved"}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.hide_outdated"}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</button>
|
2020-04-18 13:50:25 +00:00
|
|
|
{{end}}
|
2021-03-31 22:19:53 +00:00
|
|
|
</div>
|
2020-04-10 22:01:41 +00:00
|
|
|
</div>
|
|
|
|
|
{{$diff := (CommentMustAsDiff (index $comms 0))}}
|
|
|
|
|
{{if $diff}}
|
|
|
|
|
{{$file := (index $diff.Files 0)}}
|
2020-10-15 08:17:48 +00:00
|
|
|
<div id="code-preview-{{(index $comms 0).ID}}" class="ui table segment{{if $resolved}} hide{{end}}">
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
|
|
|
|
|
<div class="file-body file-code code-view code-diff code-diff-unified">
|
|
|
|
|
<table>
|
|
|
|
|
<tbody>
|
|
|
|
|
{{template "repo/diff/section_unified" dict "file" $file "root" $}}
|
|
|
|
|
</tbody>
|
|
|
|
|
</table>
|
|
|
|
|
</div>
|
2018-08-06 04:43:22 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{end}}
|
2021-10-16 02:22:24 +00:00
|
|
|
<div id="code-comments-{{(index $comms 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} hide{{end}}">
|
2020-12-17 15:52:58 +00:00
|
|
|
<div class="ui comments mb-0">
|
2020-04-10 22:01:41 +00:00
|
|
|
{{range $comms}}
|
|
|
|
|
{{ $createdSubStr:= TimeSinceUnix .CreatedUnix $.Lang }}
|
2021-05-08 15:28:25 +00:00
|
|
|
<div class="comment code-comment pb-4" id="{{.HashTag}}">
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="content">
|
2021-01-17 17:29:10 +00:00
|
|
|
<div class="header comment-header">
|
|
|
|
|
<div class="comment-header-left df ac">
|
|
|
|
|
{{if not .OriginalAuthor }}
|
|
|
|
|
<a class="avatar">
|
|
|
|
|
{{avatar .Poster}}
|
|
|
|
|
</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
{{if .OriginalAuthor }}
|
2021-09-18 16:22:51 +00:00
|
|
|
<span class="text black">
|
|
|
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
|
|
|
{{ .OriginalAuthor }}
|
|
|
|
|
</span>
|
|
|
|
|
<span class="text grey"> {{if $.Repository.OriginalURL}}</span>
|
|
|
|
|
<span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
|
2021-01-17 17:29:10 +00:00
|
|
|
{{else}}
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdSubStr | Safe}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="comment-header-right actions df ac">
|
2021-11-11 06:29:30 +00:00
|
|
|
{{if (.ShowRole.HasRole "Poster")}}
|
|
|
|
|
<div class="ui basic label">
|
|
|
|
|
{{$.i18n.Tr "repo.issues.poster"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Writer")}}
|
|
|
|
|
<div class="ui basic label">
|
|
|
|
|
{{$.i18n.Tr "repo.issues.collaborator"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if (.ShowRole.HasRole "Owner")}}
|
|
|
|
|
<div class="ui basic label">
|
|
|
|
|
{{$.i18n.Tr "repo.issues.owner"}}
|
|
|
|
|
</div>
|
2021-01-17 17:29:10 +00:00
|
|
|
{{end}}
|
2021-11-11 06:29:30 +00:00
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
|
|
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
|
2021-01-17 17:29:10 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-11-05 19:34:04 +00:00
|
|
|
<div class="text comment-content">
|
2021-05-23 14:14:03 +00:00
|
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
2020-11-05 19:34:04 +00:00
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
|
|
|
|
|
{{end}}
|
2020-10-02 15:13:46 +00:00
|
|
|
</div>
|
2021-01-17 17:29:10 +00:00
|
|
|
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
|
|
|
|
|
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
2018-08-06 04:43:22 +00:00
|
|
|
</div>
|
2021-01-17 17:29:10 +00:00
|
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
|
|
|
{{if $reactions}}
|
|
|
|
|
<div class="ui attached segment reactions">
|
|
|
|
|
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2018-08-06 04:43:22 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2021-10-16 02:22:24 +00:00
|
|
|
<div class="code-comment-buttons df ac fw mt-3 mb-2 mx-3">
|
2021-05-08 15:28:25 +00:00
|
|
|
<div class="f1">
|
2020-04-18 13:50:25 +00:00
|
|
|
{{if $resolved}}
|
2021-05-08 15:28:25 +00:00
|
|
|
<div class="ui grey text">
|
|
|
|
|
{{svg "octicon-check" 16 "mr-2"}}
|
|
|
|
|
<b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}
|
|
|
|
|
</div>
|
2020-04-18 13:50:25 +00:00
|
|
|
{{end}}
|
2021-05-08 15:28:25 +00:00
|
|
|
</div>
|
2021-10-16 02:22:24 +00:00
|
|
|
<div class="code-comment-buttons-buttons">
|
2021-05-08 15:28:25 +00:00
|
|
|
{{if and $.CanMarkConversation $isNotPending}}
|
|
|
|
|
<button class="ui tiny basic button resolve-conversation" data-origin="timeline" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $comms 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
|
|
|
|
|
{{if $resolved}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.un_resolve_conversation"}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.resolve_conversation"}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if and $.SignedUserID (not $.Repository.IsArchived)}}
|
|
|
|
|
<button class="comment-form-reply ui green tiny labeled icon button ml-2 mr-0">
|
|
|
|
|
{{svg "octicon-reply" 16 "reply icon mr-2"}}{{$.i18n.Tr "repo.diff.comment.reply"}}
|
|
|
|
|
</button>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $comms 0).ReviewID "root" $ "comment" (index $comms 0)}}
|
2018-08-06 04:43:22 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-04-10 22:01:41 +00:00
|
|
|
{{end}}
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
2020-04-10 22:01:41 +00:00
|
|
|
</div>
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
2019-07-06 22:03:00 +00:00
|
|
|
</div>
|
2019-02-18 20:55:04 +00:00
|
|
|
{{else if eq .Type 23}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-lock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-02-18 20:55:04 +00:00
|
|
|
</a>
|
|
|
|
|
{{ if .Content }}
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.lock_with_reason" .Content $createdStr | Safe}}
|
2019-07-06 22:03:00 +00:00
|
|
|
</span>
|
2019-02-18 20:55:04 +00:00
|
|
|
{{ else }}
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.lock_no_reason" $createdStr | Safe}}
|
2019-07-06 22:03:00 +00:00
|
|
|
</span>
|
2019-02-18 20:55:04 +00:00
|
|
|
{{ end }}
|
|
|
|
|
</div>
|
|
|
|
|
{{else if eq .Type 24}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-key"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-02-18 20:55:04 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.unlock_comment" $createdStr | Safe}}
|
|
|
|
|
</span>
|
2019-02-18 20:55:04 +00:00
|
|
|
</div>
|
2019-12-16 06:20:25 +00:00
|
|
|
{{else if eq .Type 25}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-git-branch"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-12-16 06:20:25 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.pulls.change_target_branch_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}}
|
2019-12-16 06:20:25 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
2019-12-27 20:30:58 +00:00
|
|
|
{{else if eq .Type 26}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-clock"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2019-12-27 20:30:58 +00:00
|
|
|
</a>
|
2020-04-19 00:15:07 +00:00
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$.i18n.Tr "repo.issues.del_time_history" $createdStr | Safe}}
|
|
|
|
|
</span>
|
2019-12-27 20:30:58 +00:00
|
|
|
<div class="detail">
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-clock"}}
|
2019-12-27 20:30:58 +00:00
|
|
|
<span class="text grey">{{.Content}}</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-04-06 16:33:34 +00:00
|
|
|
{{else if eq .Type 27}}
|
2020-04-10 22:01:41 +00:00
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-eye"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2020-04-06 16:33:34 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
2020-04-19 00:15:07 +00:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-10-12 19:55:13 +00:00
|
|
|
{{if (gt .AssigneeID 0)}}
|
|
|
|
|
{{if .RemovedAssignee}}
|
|
|
|
|
{{if eq .PosterID .AssigneeID}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.remove_review_request_self" $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.remove_review_request" (.Assignee.GetDisplayName|Escape) $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
2020-04-06 16:33:34 +00:00
|
|
|
{{else}}
|
2020-10-12 19:55:13 +00:00
|
|
|
{{$.i18n.Tr "repo.issues.review.add_review_request" (.Assignee.GetDisplayName|Escape) $createdStr | Safe}}
|
2020-04-06 16:33:34 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{else}}
|
2020-10-12 19:55:13 +00:00
|
|
|
{{if .RemovedAssignee}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.remove_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.add_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
2020-04-06 16:33:34 +00:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
2020-05-20 12:47:24 +00:00
|
|
|
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-repo-push"}}</span>
|
2020-05-20 12:47:24 +00:00
|
|
|
<span class="text grey">
|
2020-05-23 22:05:20 +00:00
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
2020-05-20 12:47:24 +00:00
|
|
|
{{ if .IsForcePush }}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
2021-08-09 18:08:51 +00:00
|
|
|
{{$.i18n.Tr (TrN $.i18n.Lang (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n") (len .Commits) $createdStr | Safe}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{if not .IsForcePush}}
|
2020-06-03 00:22:26 +00:00
|
|
|
{{template "repo/commits_list_small" dict "comment" . "root" $}}
|
2020-05-20 12:47:24 +00:00
|
|
|
{{end}}
|
2020-08-17 03:07:38 +00:00
|
|
|
{{else if eq .Type 30}}
|
|
|
|
|
{{if not $.UnitProjectsGlobalDisabled}}
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="badge">{{svg "octicon-project"}}</span>
|
2020-12-03 18:46:11 +00:00
|
|
|
<a href="{{.Poster.HomeLink}}">
|
|
|
|
|
{{avatar .Poster}}
|
2020-08-17 03:07:38 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{if gt .OldProjectID 0}}
|
|
|
|
|
{{if gt .ProjectID 0}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.change_project_at" (.OldProject.Title|Escape) (.Project.Title|Escape) $createdStr | Safe}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.remove_project_at" (.OldProject.Title|Escape) $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{else if gt .ProjectID 0}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.add_project_at" (.Project.Title|Escape) $createdStr | Safe}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2021-02-11 17:32:25 +00:00
|
|
|
{{else if eq .Type 32}}
|
|
|
|
|
<div class="timeline-item-group">
|
|
|
|
|
<div class="timeline-item event" id="{{.HashTag}}">
|
|
|
|
|
<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
|
Avatar refactor, move avatar code from `models` to `models.avatars`, remove duplicated code (#17123)
Why this refactor
The goal is to move most files from `models` package to `models.xxx` package. Many models depend on avatar model, so just move this first.
And the existing logic is not clear, there are too many function like `AvatarLink`, `RelAvatarLink`, `SizedRelAvatarLink`, `SizedAvatarLink`, `MakeFinalAvatarURL`, `HashedAvatarLink`, etc. This refactor make everything clear:
* user.AvatarLink()
* user.AvatarLinkWithSize(size)
* avatars.GenerateEmailAvatarFastLink(email, size)
* avatars.GenerateEmailAvatarFinalLink(email, size)
And many duplicated code are deleted in route handler, the handler and the model share the same avatar logic now.
2021-10-05 23:25:46 +00:00
|
|
|
<img src="{{.Poster.AvatarLink}}">
|
2021-02-11 17:32:25 +00:00
|
|
|
</a>
|
|
|
|
|
<span class="badge grey">{{svg "octicon-x" 16}}</span>
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
<a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a>
|
|
|
|
|
{{$reviewerName := ""}}
|
|
|
|
|
{{if eq .Review.OriginalAuthor ""}}
|
|
|
|
|
{{$reviewerName = .Review.Reviewer.Name}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{$reviewerName = .Review.OriginalAuthor}}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{$.i18n.Tr "repo.issues.review.dismissed" $reviewerName $createdStr | Safe}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{if .Content}}
|
|
|
|
|
<div class="timeline-item comment">
|
|
|
|
|
<div class="content">
|
|
|
|
|
<div class="ui top attached header arrow-top">
|
|
|
|
|
<span class="text grey">
|
|
|
|
|
{{$.i18n.Tr "action.review_dismissed_reason"}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui attached segment">
|
2021-05-07 08:43:41 +00:00
|
|
|
<div class="render-content markup">
|
2021-02-11 17:32:25 +00:00
|
|
|
{{if .RenderedContent}}
|
|
|
|
|
{{.RenderedContent|Str2html}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
