github.com/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-14 01:35:54 +01:00
Code Releases Wiki Activity

Fix missing repository status when migrating repository via API (#9511)

Browse Source 
* Fix API migration wrong repository status

* Force push for ci
This commit is contained in:
Lunny Xiao 2019-12-27 20:34:28 +08:00 committed by Lauris BH
parent f0bda12c49
commit a3928fd820
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/repo.go
View File

@ -1781,6 +1781,12 @@ func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) {
return sess.Commit()
}
// UpdateRepositoryStatus updates a repository's status
func UpdateRepositoryStatus(repoID int64, status RepositoryStatus) error {
_, err := x.Exec("UPDATE repository SET status = ? WHERE id = ?", status, repoID)
return err
}
// UpdateRepositoryUpdatedTime updates a repository's updated time
func UpdateRepositoryUpdatedTime(repoID int64, updateTime time.Time) error {
_, err := x.Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", updateTime.Unix(), repoID)

29
routers/api/v1/repo/repo.go
View File

@ -6,6 +6,8 @@
package repo
import (
"bytes"
"errors"
"fmt"
"net/http"
"net/url"
@ -431,10 +433,31 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
opts.Releases = false
}
repo, err := migrations.MigrateRepository(ctx.User, ctxUser.Name, opts)
if err == nil {
notification.NotifyCreateRepository(ctx.User, ctxUser, repo)
var repo *models.Repository
defer func() {
if e := recover(); e != nil {
var buf bytes.Buffer
fmt.Fprintf(&buf, "Handler crashed with error: %v", log.Stack(2))
err = errors.New(buf.String())
}
if err == nil {
repo.Status = models.RepositoryReady
if err := models.UpdateRepositoryStatus(repo.ID, repo.Status); err == nil {
notification.NotifyMigrateRepository(ctx.User, ctxUser, repo)
return
}
}
if repo != nil {
if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil {
log.Error("DeleteRepository: %v", errDelete)
}
}
}()
repo, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts)
if err == nil {
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))
return