From f64cd022a84fe13ea24e7ac5b03f1a11a8b9ac31 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Thu, 17 Jun 2021 22:02:19 +0100 Subject: [PATCH 1/3] Add button to delete undeleted repositories from failed migrations 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 cd5b0f43edbc..67e77a000bf0 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" ) @@ -621,6 +622,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 c1f189553f6f..cc12243205c1 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" .}} From f3852c37ed1c715125657a30a4c46f2b4b98a8e4 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 28 Jun 2021 14:14:37 +0100 Subject: [PATCH 2/3] as per noerw Signed-off-by: Andrew Thornton --- templates/repo/migrate/migrating.tmpl | 34 +----------------- .../repo/settings/delete_repo_modal.tmpl | 33 +++++++++++++++++ templates/repo/settings/options.tmpl | 35 +------------------ 3 files changed, 35 insertions(+), 67 deletions(-) create mode 100644 templates/repo/settings/delete_repo_modal.tmpl diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index cc12243205c1..e951040b4e3e 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -41,37 +41,5 @@ - +{{template "repo/settings/delete_repo_modal" .}} {{template "base/footer" .}} diff --git a/templates/repo/settings/delete_repo_modal.tmpl b/templates/repo/settings/delete_repo_modal.tmpl new file mode 100644 index 000000000000..61ba3fb4e39c --- /dev/null +++ b/templates/repo/settings/delete_repo_modal.tmpl @@ -0,0 +1,33 @@ + diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index eb76a3b72006..e0e231d00e2a 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -761,40 +761,7 @@ - - + {{template "repo/settings/delete_repo_modal" .}} {{if .Repository.UnitEnabled $.UnitTypeWiki}} -{{template "repo/settings/delete_repo_modal" .}} + {{template "base/footer" .}} diff --git a/templates/repo/settings/delete_repo_modal.tmpl b/templates/repo/settings/delete_repo_modal.tmpl deleted file mode 100644 index 61ba3fb4e39c..000000000000 --- a/templates/repo/settings/delete_repo_modal.tmpl +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index e0e231d00e2a..eb76a3b72006 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -761,7 +761,40 @@ - {{template "repo/settings/delete_repo_modal" .}} + + {{if .Repository.UnitEnabled $.UnitTypeWiki}}