fix build and lint errors

This commit is contained in:
☙◦ The Tablet ❀ GamerGirlandCo ◦❧
2026-04-02 20:00:54 -04:00
parent 52f6c9bc45
commit 271b6c7cae
20 changed files with 89 additions and 18 deletions
+3
View File
@@ -1,3 +1,6 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package convert
import (
+3
View File
@@ -1,3 +1,6 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (
+3
View File
@@ -1,3 +1,6 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (
+5 -1
View File
@@ -1,7 +1,11 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (
"context"
"errors"
"fmt"
"strings"
@@ -89,7 +93,7 @@ func MoveGroupItem(ctx context.Context, opts MoveGroupOptions, doer *user_model.
return err
}
if !canAccessNewParent {
return fmt.Errorf("cannot access new parent group")
return errors.New("cannot access new parent group")
}
err = parentGroup.LoadSubgroups(ctx, false)
+15 -2
View File
@@ -1,3 +1,6 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (
@@ -42,7 +45,12 @@ func TestMoveGroup(t *testing.T) {
}
origCount := unittest.GetCount(t, new(group_model.Group), cond.ToConds())
assert.NoError(t, MoveGroupItem(t.Context(), MoveGroupOptions{123, gid, true, -1}, doer))
assert.NoError(t, MoveGroupItem(t.Context(), MoveGroupOptions{
NewParent: 123,
ItemID: gid,
IsGroup: true,
NewPos: -1,
}, doer))
unittest.AssertCountByCond(t, "repo_group", cond.ToConds(), origCount+1)
}
testfn(124)
@@ -60,6 +68,11 @@ func TestMoveRepo(t *testing.T) {
})
origCount := unittest.GetCount(t, new(repo_model.Repository), cond)
assert.NoError(t, MoveGroupItem(db.DefaultContext, MoveGroupOptions{123, 32, false, -1}, doer))
assert.NoError(t, MoveGroupItem(db.DefaultContext, MoveGroupOptions{
NewParent: 123,
ItemID: 32,
IsGroup: false,
NewPos: -1,
}, doer))
unittest.AssertCountByCond(t, "repository", cond, origCount+1)
}
+5 -2
View File
@@ -1,12 +1,15 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (
"code.gitea.io/gitea/models/perm"
"context"
"slices"
"code.gitea.io/gitea/models/git"
group_model "code.gitea.io/gitea/models/group"
"code.gitea.io/gitea/models/perm"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
@@ -103,7 +106,7 @@ func (w *WebSearchGroup) doLoadChildren(opts *WebSearchOptions) error {
wsr.LatestCommitStatus = latestCommitStatuses[i]
wsr.LocaleLatestCommitStatus = latestCommitStatuses[i].LocaleString(opts.Locale)
if latestIdx > -1 {
if latestCommitStatuses[i].UpdatedUnix.AsLocalTime().Unix() > int64(latestCommitStatuses[latestIdx].UpdatedUnix.AsLocalTime().Unix()) {
if latestCommitStatuses[i].UpdatedUnix.AsLocalTime().Unix() > latestCommitStatuses[latestIdx].UpdatedUnix.AsLocalTime().Unix() {
latestIdx = i
}
} else {
+5 -3
View File
@@ -1,3 +1,6 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (
@@ -68,7 +71,7 @@ func UpdateGroupTeam(ctx context.Context, gt *group_model.RepoGroupTeam) (err er
And("group_id=?", gt.GroupID).
And("type = ?", unit.Type).
Update(unit); err != nil {
return
return err
}
}
return committer.Commit()
@@ -92,7 +95,7 @@ func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew boo
teams, err = org_model.GetTeamsWithAccessToGroup(ctx, g.OwnerID, g.ParentGroupID, perm.AccessModeRead)
}
for _, t := range teams {
var gt *group_model.RepoGroupTeam = nil
var gt *group_model.RepoGroupTeam
if gt, err = group_model.FindGroupTeamByTeamID(ctx, g.ParentGroupID, t.ID); err != nil {
return err
}
@@ -110,7 +113,6 @@ func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew boo
return err
}
for _, u := range t.Units {
newAccessMode := u.AccessMode
if g.ParentGroup == nil {
gu, err := group_model.GetGroupUnit(ctx, g.ID, t.ID, u.Type)
+3
View File
@@ -1,3 +1,6 @@
// Copyright 2025 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package group
import (