From f627e5719982f8ffd89bdeffb1667c5f3e95f96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?= =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= Date: Wed, 13 Aug 2025 16:21:41 -0400 Subject: [PATCH] apply simple linting changes --- services/group/group.go | 4 +++- services/group/team.go | 18 +++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/services/group/group.go b/services/group/group.go index 128c208a31..8c9382b016 100644 --- a/services/group/group.go +++ b/services/group/group.go @@ -2,6 +2,7 @@ package group import ( "context" + "fmt" "strings" "code.gitea.io/gitea/models/db" @@ -13,7 +14,8 @@ import ( "code.gitea.io/gitea/modules/util" ) -func NewGroup(ctx context.Context, g *group_model.Group) (err error) { +func NewGroup(ctx context.Context, g *group_model.Group) error { + var err error if len(g.Name) == 0 { return util.NewInvalidArgumentErrorf("empty group name") } diff --git a/services/group/team.go b/services/group/team.go index b22cc3471d..633d1c3a1e 100644 --- a/services/group/team.go +++ b/services/group/team.go @@ -79,38 +79,38 @@ func UpdateGroupTeam(ctx context.Context, gt *group_model.GroupTeam) (err error) // RecalculateGroupAccess recalculates team access to a group. // should only be called if and only if a group was moved from another group. -func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew bool) (err error) { +func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew bool) error { + var err error sess := db.GetEngine(ctx) if err = g.LoadParentGroup(ctx); err != nil { - return + return err } var teams []*org_model.Team if g.ParentGroup == nil { teams, err = org_model.FindOrgTeams(ctx, g.OwnerID) if err != nil { - return + return err } } else { teams, err = org_model.GetTeamsWithAccessToGroup(ctx, g.OwnerID, g.ParentGroupID, perm.AccessModeRead) } for _, t := range teams { - var gt *group_model.GroupTeam = nil if gt, err = group_model.FindGroupTeamByTeamID(ctx, g.ParentGroupID, t.ID); err != nil { return } if gt != nil { if err = group_model.UpdateTeamGroup(ctx, g.OwnerID, t.ID, g.ID, gt.AccessMode, gt.CanCreateIn, isNew); err != nil { - return + return err } } else { if err = group_model.UpdateTeamGroup(ctx, g.OwnerID, t.ID, g.ID, t.AccessMode, t.IsOwnerTeam() || t.AccessMode >= perm.AccessModeAdmin || t.CanCreateOrgRepo, isNew); err != nil { - return + return err } } if err = t.LoadUnits(ctx); err != nil { - return + return err } for _, u := range t.Units { @@ -129,7 +129,7 @@ func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew boo GroupID: g.ID, AccessMode: newAccessMode, }); err != nil { - return + return err } } else { if _, err = sess.Table("group_unit").Where(builder.Eq{ @@ -144,5 +144,5 @@ func RecalculateGroupAccess(ctx context.Context, g *group_model.Group, isNew boo } } } - return + return err }