Merge branch main into refactor-commit-list-page-group-by-date

Author: kerwin612

templates/repo/commits_list_group_by_date.tmpl

@@ -21,18 +21,18 @@
 					<div class="tw-pt-4 tw-pl-4 title">
 						<h4>
 							<span class="message-wrapper">
-								{{if $.PageIsWiki}}
-									<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary | ctx.RenderUtils.RenderEmoji}}</span>
-								{{else}}
-									{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
-									<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink ($.Repository.ComposeMetas ctx)}}</span>
-								{{end}}
+							{{if $.PageIsWiki}}
+								<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary | ctx.RenderUtils.RenderEmoji}}</span>
+							{{else}}
+								{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
+								<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink ($.Repository.ComposeCommentMetas ctx)}}</span>
+							{{end}}
 							</span>
 							{{if IsMultilineCommitMessage .Message}}
 								<button class="ui button ellipsis-button" aria-expanded="false" data-global-click="onRepoEllipsisButtonClick">...</button>
 							{{end}}
 							{{if IsMultilineCommitMessage .Message}}
-								<pre class="commit-body tw-hidden">{{ctx.RenderUtils.RenderCommitBody .Message ($.Repository.ComposeMetas ctx)}}</pre>
+								<pre class="commit-body tw-hidden">{{ctx.RenderUtils.RenderCommitBody .Message ($.Repository.ComposeCommentMetas ctx)}}</pre>
 							{{end}}
 							{{if $.CommitsTagsMap}}
 								{{range (index $.CommitsTagsMap .ID.String)}}
@@ -90,15 +90,15 @@
 							{{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}}
 							{{if not $.PageIsWiki}}
 								{{/* view single file diff */}}
-								{{if $.FileName}}
+								{{if $.FileTreePath}}
 								<a class="btn interact-bg tw-p-2 view-single-diff" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_file_diff"}}"
-									href="{{$commitRepoLink}}/commit/{{.ID.String}}?files={{$.FileName}}"
+									href="{{$commitRepoLink}}/commit/{{.ID.String}}?files={{$.FileTreePath}}"
 								>{{svg "octicon-file-diff"}}</a>
 								{{end}}
 
 								{{/* view at history point */}}
 								{{$viewCommitLink := printf "%s/src/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
-								{{if $.FileName}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileName)}}{{end}}
+								{{if $.FileTreePath}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileTreePath)}}{{end}}
 								<a class="btn interact-bg tw-p-2 view-commit-path" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_path"}}" href="{{$viewCommitLink}}">{{svg "octicon-file-code"}}</a>
 							{{end}}
 						</div>