Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add button to delete undeleted repositories from failed migrations #16197

Merged
merged 5 commits into from
Jun 30, 2021
+41 −0
Merged

Add button to delete undeleted repositories from failed migrations #16197

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f64cd02
Add button to delete undeleted repositories from failed migrations
zeripath Jun 17, 2021
1333e3d
Merge remote-tracking branch 'origin/main' into fix-16154-button-to-d…
zeripath Jun 28, 2021
f3852c3
as per noerw
zeripath Jun 28, 2021
e08e3b6
Revert "as per noerw"
zeripath Jun 30, 2021
c43555c
Merge branch 'main' into fix-16154-button-to-delete-failed-migration-…
6543 Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 <[email protected]>
@zeripath
zeripath committed Jun 18, 2021
commit f64cd022a84fe13ea24e7ac5b03f1a11a8b9ac31
2 changes: 2 additions & 0 deletions routers/web/repo/view.go
View file
Original file line number Diff line number Diff line change
@@ -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
}
39 changes: 39 additions & 0 deletions templates/repo/migrate/migrating.tmpl
View file
Original file line number Diff line number Diff line change
@@ -28,11 +28,50 @@
<p>{{.i18n.Tr "repo.migrate.migrating_failed" .CloneAddr | Safe}}</p>
<p id="repo_migrating_failed_error"></p>
</div>
{{if and .Failed .Permission.IsAdmin}}
<div class="ui divider"></div>
<div class="item">
<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.i18n.Tr "repo.settings.delete"}}</button>
</div>
{{end}}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ui small modal" id="delete-repo-modal">
<div class="header">
{{.i18n.Tr "repo.settings.delete"}}
</div>
<div class="content">
<div class="ui warning message text left">
{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}}<br>
{{.i18n.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}}
{{if .Repository.NumForks}}<br>
{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}
{{end}}
</div>
<form class="ui form" action="{{.Link}}/settings" method="post">
{{.CsrfTokenHtml}}
<input type="hidden" name="action" value="delete">
<div class="field">
<label>
{{.i18n.Tr "repo.settings.transfer_form_title"}}
<span class="text red">{{.Repository.Name}}</span>
</label>
</div>
<div class="required field">
<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
<input id="repo_name" name="repo_name" required>
</div>

<div class="text right actions">
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
<button class="ui red button">{{.i18n.Tr "repo.settings.confirm_delete"}}</button>
</div>
</form>
</div>
</div>
{{template "base/footer" .}}