Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-13 08:55:40 +02:00
Code Issues Activity

[services] update MoveGroupItem function to set newPos to the length of the new parent's subgroups/repositories

Browse Source
This commit is contained in:
☙◦ The Tablet ❀ GamerGirlandCo ◦❧ 2025-08-10 21:53:30 -04:00
parent 78d76049bb
commit 21eac079bc
No known key found for this signature in database
GPG Key ID: 924A5F6AF051E87C
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
services/group/group.go
View File

@ -56,17 +56,30 @@ func MoveRepositoryToGroup(ctx context.Context, repo *repo_model.Repository, new
} }
func MoveGroupItem(ctx context.Context, itemID, newParent int64, isGroup bool, newPos int) (err error) { func MoveGroupItem(ctx context.Context, itemID, newParent int64, isGroup bool, newPos int) (err error) {
ctx, committer, err := db.TxContext(ctx) var committer db.Committer
ctx, committer, err = db.TxContext(ctx)
if err != nil { if err != nil {
return err return err
} }
defer committer.Close() defer committer.Close()
var parentGroup *group_model.Group
parentGroup, err = group_model.GetGroupByID(ctx, newParent)
if err != nil {
return err
}
err = parentGroup.LoadSubgroups(ctx, false)
if err != nil {
return err
}
if isGroup { if isGroup {
group, err := group_model.GetGroupByID(ctx, itemID) var group *group_model.Group
group, err = group_model.GetGroupByID(ctx, itemID)
if err != nil { if err != nil {
return err return err
} }
if newPos < 0 {
newPos = len(parentGroup.Subgroups)
}
if group.ParentGroupID != newParent || group.SortOrder != newPos { if group.ParentGroupID != newParent || group.SortOrder != newPos {
if err = group_model.MoveGroup(ctx, group, newParent, newPos); err != nil { if err = group_model.MoveGroup(ctx, group, newParent, newPos); err != nil {
return err return err
@ -76,10 +89,21 @@ func MoveGroupItem(ctx context.Context, itemID, newParent int64, isGroup bool, n
} }
} }
} else { } else {
repo, err := repo_model.GetRepositoryByID(ctx, itemID) var repo *repo_model.Repository
repo, err = repo_model.GetRepositoryByID(ctx, itemID)
if err != nil { if err != nil {
return err return err
} }
if newPos < 0 {
var repoCount int64
repoCount, err = repo_model.CountRepository(ctx, &repo_model.SearchRepoOptions{
GroupID: newParent,
})
if err != nil {
return err
}
newPos = int(repoCount)
}
if repo.GroupID != newParent || repo.GroupSortOrder != newPos { if repo.GroupID != newParent || repo.GroupSortOrder != newPos {
if err = MoveRepositoryToGroup(ctx, repo, newParent, newPos); err != nil { if err = MoveRepositoryToGroup(ctx, repo, newParent, newPos); err != nil {
return err return err