Skip to content

Commit 08445d5

Browse files
GiteaBotKN4CK3R
GiteaBot
and
KN4CK3R
authored
Refactor template empty checks (#28351) (#28354)
Backport #28351 by @KN4CK3R Fix #28347 As there is no info how to reproduce it, I can't test it. Fix may be `section_split.tmpl @ 126/130`. Other changes are "empty check" refactorings. Co-authored-by: KN4CK3R <[email protected]>
1 parent b71d4c3 commit 08445d5

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

‎templates/repo/actions/runs_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="flex-list">
2-
{{if eq (len .Runs) 0}}
2+
{{if not .Runs}}
33
<div class="empty-placeholder">
44
{{svg "octicon-no-entry" 48}}
55
<h2>{{if $.IsFiltered}}{{ctx.Locale.Tr "actions.runs.no_results"}}{{else}}{{ctx.Locale.Tr "actions.runs.no_runs"}}{{end}}</h2>

‎templates/repo/diff/section_split.tmpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,39 +108,39 @@
108108
</tr>
109109
{{if and (eq .GetType 3) $hasmatch}}
110110
{{$match := index $section.Lines $line.Match}}
111-
{{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}}
111+
{{if or $line.Comments $match.Comments}}
112112
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
113113
<td class="add-comment-left" colspan="4">
114-
{{if gt (len $line.Comments) 0}}
114+
{{if $line.Comments}}
115115
{{if eq $line.GetCommentSide "previous"}}
116116
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
117117
{{end}}
118118
{{end}}
119-
{{if gt (len $match.Comments) 0}}
119+
{{if $match.Comments}}
120120
{{if eq $match.GetCommentSide "previous"}}
121121
{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
122122
{{end}}
123123
{{end}}
124124
</td>
125125
<td class="add-comment-right" colspan="4">
126-
{{if eq $line.GetCommentSide "proposed"}}
127-
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
126+
{{if $line.Comments}}
127+
{{if eq $line.GetCommentSide "proposed"}}
128+
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
129+
{{end}}
128130
{{end}}
129-
{{if gt (len $match.Comments) 0}}
131+
{{if $match.Comments}}
130132
{{if eq $match.GetCommentSide "proposed"}}
131133
{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
132134
{{end}}
133135
{{end}}
134136
</td>
135137
</tr>
136138
{{end}}
137-
{{else if gt (len $line.Comments) 0}}
139+
{{else if $line.Comments}}
138140
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
139141
<td class="add-comment-left" colspan="4">
140-
{{if gt (len $line.Comments) 0}}
141-
{{if eq $line.GetCommentSide "previous"}}
142-
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
143-
{{end}}
142+
{{if eq $line.GetCommentSide "previous"}}
143+
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
144144
{{end}}
145145
</td>
146146
<td class="add-comment-right" colspan="4">

‎templates/repo/diff/section_unified.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/}}</td>
6161
{{end}}
6262
</tr>
63-
{{if gt (len $line.Comments) 0}}
63+
{{if $line.Comments}}
6464
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
6565
<td class="add-comment-left add-comment-right" colspan="5">
6666
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}

‎templates/repo/header.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@
8181
{{end}}
8282
{{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
8383
<div class="ui labeled button
84-
{{if or (not $.IsSigned) (and (not $.CanSignedUserFork) (eq (len $.UserAndOrgForks) 0))}}
84+
{{if or (not $.IsSigned) (and (not $.CanSignedUserFork) (not $.UserAndOrgForks))}}
8585
disabled
8686
{{end}}"
8787
{{if not $.IsSigned}}
8888
data-tooltip-content="{{ctx.Locale.Tr "repo.fork_guest_user"}}"
89-
{{else if and (not $.CanSignedUserFork) (eq (len $.UserAndOrgForks) 0)}}
89+
{{else if and (not $.CanSignedUserFork) (not $.UserAndOrgForks)}}
9090
data-tooltip-content="{{ctx.Locale.Tr "repo.fork_from_self"}}"
9191
{{end}}
9292
>
@@ -98,7 +98,7 @@
9898
href="{{AppSubUrl}}/{{(index $.UserAndOrgForks 0).FullName}}"
9999
{{/*else is not required here, because the button shouldn't link to any site if you can't create a fork*/}}
100100
{{end}}
101-
{{else if eq (len $.UserAndOrgForks) 0}}
101+
{{else if not $.UserAndOrgForks}}
102102
href="{{AppSubUrl}}/repo/fork/{{.ID}}"
103103
{{else}}
104104
data-modal="#fork-repo-modal"

‎templates/repo/issue/filters.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="issue-filters" class="issue-list-toolbar">
22
<div class="issue-list-toolbar-left">
3-
{{if and ($.CanWriteIssuesOrPulls) (gt (len .Issues) 0)}}
3+
{{if and $.CanWriteIssuesOrPulls .Issues}}
44
<input type="checkbox" autocomplete="off" class="issue-checkbox-all gt-mr-4" title="{{ctx.Locale.Tr "repo.issues.action_check_all"}}">
55
{{end}}
66
{{template "repo/issue/openclose" .}}

‎templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
</div>
340340
</div>
341341
{{end}}
342-
{{if gt (len .WorkingUsers) 0}}
342+
{{if .WorkingUsers}}
343343
<div class="divider"></div>
344344
<div class="ui comments">
345345
<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time) | Safe}}</strong></span>

‎templates/shared/issuelist.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
{{ctx.Locale.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}}
141141
</span>
142142
{{end}}
143-
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
143+
{{if and (not .PullRequest.HasMerged) .PullRequest.ConflictedFiles}}
144144
<span class="conflicting flex-text-inline">
145145
{{svg "octicon-x" 14}}
146146
{{ctx.Locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}}

‎templates/user/dashboard/feeds.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
{{else if .GetOpType.InActions "comment_issue" "approve_pull_request" "reject_pull_request" "comment_pull"}}
106106
<a href="{{.GetCommentLink ctx}}" class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</a>
107107
{{$comment := index .GetIssueInfos 1}}
108-
{{if gt (len $comment) 0}}
108+
{{if $comment}}
109109
<div class="markup gt-font-14">{{RenderMarkdownToHtml ctx $comment}}</div>
110110
{{end}}
111111
{{else if .GetOpType.InActions "merge_pull_request"}}

‎templates/user/notification/notification_div.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525
<div class="gt-p-0">
2626
<div id="notification_table">
27-
{{if eq (len .Notifications) 0}}
27+
{{if not .Notifications}}
2828
<div class="gt-df gt-ac gt-fc gt-p-4">
2929
{{svg "octicon-inbox" 56 "gt-mb-4"}}
3030
{{if eq .Status 1}}

‎templates/user/notification/notification_subscriptions.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</div>
6464
</div>
6565
<div class="divider"></div>
66-
{{if eq (len .Issues) 0}}
66+
{{if not .Issues}}
6767
{{ctx.Locale.Tr "notification.no_subscriptions"}}
6868
{{else}}
6969
{{template "shared/issuelist" dict "." . "listType" "dashboard"}}

‎templates/user/settings/keys_gpg.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{{if .Verified}}
5656
<span class="flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{ctx.Locale.Tr "settings.gpg_key_verified"}}</strong></span>
5757
{{end}}
58-
{{if gt (len .Emails) 0}}
58+
{{if .Emails}}
5959
<span class="flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.gpg_key_matched_identities_long"}}">{{svg "octicon-mail"}} {{ctx.Locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}<strong>{{.Email}} </strong>{{end}}</span>
6060
{{end}}
6161
<div class="flex-item-body">

0 commit comments

Comments
 (0)