]> source.dussan.org Git - gitea.git/commitdiff
Refactor repo commit list (#23690)
authorwxiaoguang <wxiaoguang@gmail.com>
Mon, 27 Mar 2023 14:44:51 +0000 (22:44 +0800)
committerGitHub <noreply@github.com>
Mon, 27 Mar 2023 14:44:51 +0000 (15:44 +0100)
### Before

* The check of `if PullRequest.BaseRepo.Name` doesn't make sense,
because the `$commitLink` is always constructed below
* Many `if` blocks make the HTML tags (likely) not match in IDE.
Although the rendered result matches, it's very unfriendly to editors or
code analyzer, and it's difficult to read.

### After

Move the `$commitLink` assignment ahead.

Simplify the code, resolve the above problems.

templates/repo/commits_list_small.tmpl

index 7c34a8f09e9bf44285e0a4ac52b9169c21cde3ad..40a9843c82e17f881dc050e8967d7b94d7bb132d 100644 (file)
@@ -13,6 +13,8 @@
                        {{avatarByEmail $.root.Context .Author.Email .Author.Name}}
                {{end}}
 
+               {{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}}
+
                <span class="ui float right shabox">
                        {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $.root}}
                        {{$class := "ui sha label"}}
                                        {{$class = (printf "%s%s" $class " isWarning")}}
                                {{end}}
                        {{end}}
-                       {{if $.comment.Issue.PullRequest.BaseRepo.Name}}
-                               <a href="{{$.comment.Issue.PullRequest.BaseRepo.Link}}/commit/{{PathEscape .ID.String}}" rel="nofollow" class="{{$class}}">
-                       {{else}}
-                               <span class="{{$class}}">
-                       {{end}}
-                       <span class="shortsha">{{ShortSha .ID.String}}</span>
-                       {{if .Signature}}
-                               {{template "repo/shabox_badge" dict "root" $.root "verification" .Verification}}
-                       {{end}}
-                       {{if $.comment.Issue.PullRequest.BaseRepo.Name}}
-                               </a>
-                       {{else}}
-                               </span>
-                       {{end}}
+                       <a href="{{$commitLink}}" rel="nofollow" class="{{$class}}">
+                               <span class="shortsha">{{ShortSha .ID.String}}</span>
+                               {{if .Signature}}
+                                       {{template "repo/shabox_badge" dict "root" $.root "verification" .Verification}}
+                               {{end}}
+                       </a>
                </span>
 
-               {{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}}
                <span class="gt-mono commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
                {{if IsMultilineCommitMessage .Message}}
                        <button class="ui button ellipsis-button" aria-expanded="false">...</button>