fix: avoid nil panic and refactor some trivial problems (#39251)

This commit is contained in:
wxiaoguang
2026-09-06 09:49:27 +00:00
committed by GitHub
parent 87d5497da0
commit 3176f37887
16 changed files with 91 additions and 126 deletions
+4 -9
View File
@@ -51,15 +51,10 @@
</tr>
</thead>
<tbody>
{{range .PackageDescriptors}}
{{range $pd := .PackageDescriptors}}
<tr>
<td>{{.Version.ID}}</td>
<td>
<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
{{if .Owner.Visibility.IsPrivate}}
<span class="tw-text-gold">{{svg "octicon-lock"}}</span>
{{end}}
</td>
<td>{{template "admin/shared/owner" dict "OwnerUser" $pd.Owner}}</td>
<td>{{.Package.Type.Name}}</td>
<td class="gt-ellipsis tw-max-w-48">{{.Package.Name}}</td>
<td class="gt-ellipsis tw-max-w-48"><a href="{{.VersionWebLink}}">{{.Version.Version}}</a></td>
@@ -73,8 +68,8 @@
<td>{{DateUtils.AbsoluteShort .Version.CreatedUnix}}</td>
<td>
<a class="tw-text-red show-modal" href data-modal="#admin-package-delete-modal"
data-modal-form.url="{{$.Link}}/delete?page={{$.Page.Paginator.Current}}&sort={{$.SortType}}&id={{.Version.ID}}"
data-modal-package-name="{{.Package.Name}}" data-modal-package-version="{{.Version.Version}}"
data-modal-form.url="{{$.Link}}/delete?id={{$pd.Version.ID}}"
data-modal-package-name="{{$pd.Package.Name}}" data-modal-package-version="{{$pd.Version.Version}}"
>{{svg "octicon-trash"}}</a>
</td>
</tr>
+5 -10
View File
@@ -43,15 +43,10 @@
</tr>
</thead>
<tbody>
{{range .Repos}}
{{range $repo := .Repos}}
<tr>
<td>{{.ID}}</td>
<td>
<a class="tw-break-anywhere" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
{{if .Owner.Visibility.IsPrivate}}
<span class="tw-text-gold">{{svg "octicon-lock"}}</span>
{{end}}
</td>
<td>{{template "admin/shared/owner" dict "OwnerUser" $repo.Owner}}</td>
<td>
<a class="tw-break-anywhere" href="{{.Link}}">{{.Name}}</a>
{{if .IsArchived}}
@@ -59,7 +54,7 @@
{{end}}
{{if .IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
{{else}}
{{else if .Owner}}
{{if .Owner.Visibility.IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{end}}
@@ -86,8 +81,8 @@
<td>{{DateUtils.AbsoluteShort .CreatedUnix}}</td>
<td>
<a class="tw-text-red show-modal" href data-modal="#admin-repo-delete-modal"
data-modal-form.url="{{$.Link}}/delete?page={{$.Page.Paginator.Current}}&sort={{$.SortType}}&id={{.ID}}"
data-modal-repo-name="{{.Name}}"
data-modal-form.url="{{$.Link}}/delete?id={{$repo.ID}}"
data-modal-repo-name="{{$repo.Name}}"
>{{svg "octicon-trash"}}</a>
</td>
</tr>
+5
View File
@@ -0,0 +1,5 @@
{{$ownerUser := $.OwnerUser}}
{{if $ownerUser}}
<a class="tw-break-anywhere" href="{{$ownerUser.HomeLink}}">{{$ownerUser.Name}}</a>
{{if $ownerUser.Visibility.IsPrivate}}<span class="tw-text-gold">{{svg "octicon-lock"}}</span>{{end}}
{{end}}