Skip to content

Commit 71dfc97

Browse files
committed
Fix build
1 parent 45d7872 commit 71dfc97

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

models/repo.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,13 @@ func CanUserForkRepo(user *user_model.User, repo *repo_model.Repository) (bool,
295295
}
296296

297297
// GetForksByUserAndOrgs return forked repos of the user and owned orgs
298-
func (repo *Repository) GetForksByUserAndOrgs(user *user_model.User) ([]*Repository, error) {
299-
var repoList []*Repository
298+
func GetForksByUserAndOrgs(user *user_model.User, repo *repo_model.Repository) ([]*repo_model.Repository, error) {
299+
var repoList []*repo_model.Repository
300300
if user == nil {
301301
return repoList, nil
302302
}
303-
var forkedRepo *Repository
304-
forkedRepo, err := repo.GetUserFork(user.ID)
303+
var forkedRepo *repo_model.Repository
304+
forkedRepo, err := repo_model.GetUserFork(repo.ID, user.ID)
305305
if err != nil {
306306
return repoList, err
307307
}
@@ -313,7 +313,7 @@ func (repo *Repository) GetForksByUserAndOrgs(user *user_model.User) ([]*Reposit
313313
return repoList, err
314314
}
315315
for _, org := range canCreateRepos {
316-
forkedRepo, err := repo.GetUserFork(org.ID)
316+
forkedRepo, err := repo_model.GetUserFork(repo.ID, org.ID)
317317
if err != nil {
318318
return repoList, err
319319
}

modules/context/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) {
506506
}
507507
ctx.Data["CanSignedUserFork"] = canSignedUserFork
508508

509-
userAndOrgForks, err := ctx.Repo.Repository.GetForksByUserAndOrgs(ctx.User)
509+
userAndOrgForks, err := models.GetForksByUserAndOrgs(ctx.User, ctx.Repo.Repository)
510510
if err != nil {
511511
ctx.ServerError("GetForksByUserAndOrgs", err)
512512
return

0 commit comments

Comments
 (0)