diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-03-27 22:44:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 15:44:51 +0100 |
| commit | ec261b63e14f84da3e2d9a6e27c8b831a7750677 (patch) | |
| tree | c5e8775065780d0c8c3c3b3088482081869e4030 | |
| parent | b78c955958301dde72d8caf189531f6e53c496b4 (diff) | |
| download | gitea-ec261b63e14f84da3e2d9a6e27c8b831a7750677.tar.gz gitea-ec261b63e14f84da3e2d9a6e27c8b831a7750677.zip | |
Refactor repo commit list (#23690)
### 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.
| -rw-r--r-- | templates/repo/commits_list_small.tmpl | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 7c34a8f09e..40a9843c82 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -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"}} @@ -30,23 +32,14 @@ {{$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> |