mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-11 20:05:38 +02:00
fix more build errors
This commit is contained in:
parent
0f6bd6bc5e
commit
c84d2277de
@ -29,7 +29,7 @@ func ToAPIGroup(ctx context.Context, g *group_model.Group, actor *user_model.Use
|
|||||||
}); err != nil {
|
}); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if _, apiGroup.NumRepos, err = repo_model.SearchRepositoryByCondition(ctx, &repo_model.SearchRepoOptions{
|
if _, apiGroup.NumRepos, err = repo_model.SearchRepositoryByCondition(ctx, repo_model.SearchRepoOptions{
|
||||||
GroupID: g.ID,
|
GroupID: g.ID,
|
||||||
Actor: actor,
|
Actor: actor,
|
||||||
OwnerID: g.OwnerID,
|
OwnerID: g.OwnerID,
|
||||||
|
|||||||
@ -31,13 +31,13 @@ func DeleteGroup(ctx context.Context, gid int64) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// move all repos in the deleted group to its immediate parent
|
// move all repos in the deleted group to its immediate parent
|
||||||
repos, cnt, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
|
repos, cnt, err := repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{
|
||||||
GroupID: gid,
|
GroupID: gid,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
_, inParent, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
|
_, inParent, err := repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{
|
||||||
GroupID: toDelete.ParentGroupID,
|
GroupID: toDelete.ParentGroupID,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -96,7 +96,7 @@ func MoveGroupItem(ctx context.Context, itemID, newParent int64, isGroup bool, n
|
|||||||
}
|
}
|
||||||
if newPos < 0 {
|
if newPos < 0 {
|
||||||
var repoCount int64
|
var repoCount int64
|
||||||
repoCount, err = repo_model.CountRepository(ctx, &repo_model.SearchRepoOptions{
|
repoCount, err = repo_model.CountRepository(ctx, repo_model.SearchRepoOptions{
|
||||||
GroupID: newParent,
|
GroupID: newParent,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -35,7 +35,7 @@ type GroupWebSearchOptions struct {
|
|||||||
Locale translation.Locale
|
Locale translation.Locale
|
||||||
Recurse bool
|
Recurse bool
|
||||||
Actor *user_model.User
|
Actor *user_model.User
|
||||||
RepoOpts *repo_model.SearchRepoOptions
|
RepoOpts repo_model.SearchRepoOptions
|
||||||
GroupOpts *group_model.FindGroupsOptions
|
GroupOpts *group_model.FindGroupsOptions
|
||||||
OrgID int64
|
OrgID int64
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user