Skip to content

Commit c27a3af

Browse files
authored
Redirect to package after version deletion (#25594) (#25599)
Related #25559 Current behaviour: 1. Deletion of a package version 2. Redirect to the owners package list New behaviour: 1. Deletion of a package version 2.1. If there are more versions available, redirect to the package again 2.2. If there are no versions available, redirect to the owners package list
1 parent 12aca3e commit c27a3af

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

routers/web/user/package.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,13 @@ func PackageSettingsPost(ctx *context.Context) {
420420
ctx.Flash.Success(ctx.Tr("packages.settings.delete.success"))
421421
}
422422

423-
ctx.Redirect(ctx.Package.Owner.HomeLink() + "/-/packages")
423+
redirectURL := ctx.Package.Owner.HomeLink() + "/-/packages"
424+
// redirect to the package if there are still versions available
425+
if has, _ := packages_model.ExistVersion(ctx, &packages_model.PackageSearchOptions{PackageID: ctx.Package.Descriptor.Package.ID}); has {
426+
redirectURL = ctx.Package.Descriptor.PackageWebLink()
427+
}
428+
429+
ctx.Redirect(redirectURL)
424430
return
425431
}
426432
}

templates/package/view.tmpl

+9-11
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,17 @@
8484
{{end}}
8585
</div>
8686
{{end}}
87-
{{if .LatestVersions}}
88-
<div class="ui divider"></div>
89-
<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
90-
<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
91-
<div class="ui relaxed list">
92-
{{range .LatestVersions}}
93-
<div class="item gt-df">
94-
<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
95-
<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
96-
</div>
97-
{{end}}
87+
<div class="ui divider"></div>
88+
<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
89+
<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
90+
<div class="ui relaxed list">
91+
{{range .LatestVersions}}
92+
<div class="item gt-df">
93+
<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
94+
<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
9895
</div>
9996
{{end}}
97+
</div>
10098
{{if or .CanWritePackages .HasRepositoryAccess}}
10199
<div class="ui divider"></div>
102100
<div class="ui relaxed list">

0 commit comments

Comments
 (0)