tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-10-31 11:28:24 +00:00
Code Releases Activity

Fix bug

Browse Source
This commit is contained in:
Lunny Xiao
2024-12-12 12:00:25 -08:00
parent 82ca99db2d
commit 9632e6fbc0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/repo/fork.go
View File

@@ -76,7 +76,7 @@ func GetForksByUserAndOrgs(ctx context.Context, user *user_model.User, repo *Rep
if user == nil { if user == nil {
return repoList, nil return repoList, nil
} }
forkedRepo, err := GetForkedRepo(ctx, repo.ID, user.ID) forkedRepo, err := GetForkedRepo(ctx, user.ID, repo.ID)
if err != nil && !IsErrRepoNotExist(err) { if err != nil && !IsErrRepoNotExist(err) {
return repoList, err return repoList, err
} }

6
models/repo/fork_test.go
View File

@@ -13,21 +13,21 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func TestGetUserFork(t *testing.T) { func Test_GetForkedRepo(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase()) assert.NoError(t, unittest.PrepareTestDatabase())
// User13 has repo 11 forked from repo10 // User13 has repo 11 forked from repo10
repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 10) repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 10)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, repo) assert.NotNil(t, repo)
repo, err = repo_model.GetForkedRepo(db.DefaultContext, repo.ID, 13) repo, err = repo_model.GetForkedRepo(db.DefaultContext, 13, repo.ID)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, repo) assert.NotNil(t, repo)
repo, err = repo_model.GetRepositoryByID(db.DefaultContext, 9) repo, err = repo_model.GetRepositoryByID(db.DefaultContext, 9)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, repo) assert.NotNil(t, repo)
repo, err = repo_model.GetForkedRepo(db.DefaultContext, repo.ID, 13) repo, err = repo_model.GetForkedRepo(db.DefaultContext, 13, repo.ID)
assert.NoError(t, err) assert.NoError(t, err)
assert.Nil(t, repo) assert.Nil(t, repo)
} }

2
services/repository/fork.go
View File

@@ -71,7 +71,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
} }
} }
forkedRepo, err := repo_model.GetForkedRepo(ctx, opts.BaseRepo.ID, owner.ID) forkedRepo, err := repo_model.GetForkedRepo(ctx, owner.ID, opts.BaseRepo.ID)
if err != nil && !repo_model.IsErrRepoNotExist(err) { if err != nil && !repo_model.IsErrRepoNotExist(err) {
return nil, err return nil, err
} }