From 365c4e9316bbcc8bdf9cf68ef237bf18ae8db315 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 30 Jun 2021 20:14:53 +0100 Subject: [PATCH] Add button to delete undeleted repositories from failed migrations (#16197) This PR adds a button to delete failed repositories if there has been a failure during migration and for whatever reason the repository doesn't get deleted automatically. Fix #16154 Signed-off-by: Andrew Thornton --- routers/web/repo/view.go | 2 ++ templates/repo/migrate/migrating.tmpl | 39 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 74e2a29597..90d06d11c1 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -29,6 +29,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/typesniffer" ) @@ -624,6 +625,7 @@ func Home(ctx *context.Context) { ctx.Data["Repo"] = ctx.Repo ctx.Data["MigrateTask"] = task ctx.Data["CloneAddr"] = safeURL(cfg.CloneAddr) + ctx.Data["Failed"] = task.Status == structs.TaskStatusFailed ctx.HTML(http.StatusOK, tplMigrating) return } diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index c1f189553f..cc12243205 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -28,6 +28,12 @@

{{.i18n.Tr "repo.migrate.migrating_failed" .CloneAddr | Safe}}

+ {{if and .Failed .Permission.IsAdmin}} +
+
+ +
+ {{end}} @@ -35,4 +41,37 @@ + {{template "base/footer" .}}