Skip to content

Commit 78b1cb9

Browse files
committed
Some improvements
1 parent f286ace commit 78b1cb9

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

models/repo/transfer.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ func GetPendingRepositoryTransfers(ctx context.Context, opts *PendingRepositoryT
184184
Find(&transfers)
185185
}
186186

187+
func IsRepositoryTransferExist(ctx context.Context, repoID int64) (bool, error) {
188+
return db.GetEngine(ctx).Where("repo_id = ?", repoID).Exist(new(RepoTransfer))
189+
}
190+
187191
// GetPendingRepositoryTransfer fetches the most recent and ongoing transfer
188192
// process for the repository
189193
func GetPendingRepositoryTransfer(ctx context.Context, repo *Repository) (*RepoTransfer, error) {
@@ -233,14 +237,15 @@ func CreatePendingRepositoryTransfer(ctx context.Context, doer, newOwner *user_m
233237
return err
234238
}
235239

236-
_, err = GetPendingRepositoryTransfer(ctx, repo)
237-
if err == nil {
240+
exist, err := IsRepositoryTransferExist(ctx, repo.ID)
241+
if err != nil {
242+
return err
243+
}
244+
if exist {
238245
return ErrRepoTransferInProgress{
239246
Uname: repo.Owner.LowerName,
240247
Name: repo.Name,
241248
}
242-
} else if !IsErrNoPendingTransfer(err) {
243-
return err
244249
}
245250

246251
repo.Status = RepositoryPendingTransfer

routers/web/repo/repo.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,8 @@ func handleActionError(ctx *context.Context, err error) {
335335
ctx.Flash.Error(ctx.Tr("repo.action.blocked_user"))
336336
} else if errors.Is(err, util.ErrPermissionDenied) {
337337
ctx.Error(http.StatusNotFound)
338-
return
339338
} else {
340339
ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.PathParam("action")), err)
341-
return
342340
}
343341
}
344342
}

0 commit comments

Comments
 (0)