Skip to content

Commit f5f921c

Browse files
authored
Fix wrong transfer hint (#30889)
Fix #30187
1 parent d9b37d0 commit f5f921c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

routers/web/repo/setting/setting.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,7 @@ func SettingsPost(ctx *context.Context) {
789789
ctx.Repo.GitRepo = nil
790790
}
791791

792+
oldFullname := repo.FullName()
792793
if err := repo_service.StartRepositoryTransfer(ctx, ctx.Doer, newOwner, repo, nil); err != nil {
793794
if repo_model.IsErrRepoAlreadyExist(err) {
794795
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplSettingsOptions, nil)
@@ -803,8 +804,13 @@ func SettingsPost(ctx *context.Context) {
803804
return
804805
}
805806

806-
log.Trace("Repository transfer process was started: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner)
807-
ctx.Flash.Success(ctx.Tr("repo.settings.transfer_started", newOwner.DisplayName()))
807+
if ctx.Repo.Repository.Status == repo_model.RepositoryPendingTransfer {
808+
log.Trace("Repository transfer process was started: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner)
809+
ctx.Flash.Success(ctx.Tr("repo.settings.transfer_started", newOwner.DisplayName()))
810+
} else {
811+
log.Trace("Repository transferred: %s -> %s", oldFullname, ctx.Repo.Repository.FullName())
812+
ctx.Flash.Success(ctx.Tr("repo.settings.transfer_succeed"))
813+
}
808814
ctx.Redirect(repo.Link() + "/settings")
809815

810816
case "cancel_transfer":

0 commit comments

Comments
 (0)