Skip to content

Commit fe19586

Browse files
format files
1 parent 21cea01 commit fe19586

File tree

15 files changed

+37
-18
lines changed

15 files changed

+37
-18
lines changed

models/group/avatar.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
func (g *Group) CustomAvatarRelativePath() string {
1313
return g.Avatar
1414
}
15+
1516
func (g *Group) relAvatarLink() string {
1617
// If no avatar - path is empty
1718
avatarPath := g.CustomAvatarRelativePath()
@@ -28,6 +29,7 @@ func (g *Group) AvatarLink(ctx context.Context) string {
2829
}
2930
return ""
3031
}
32+
3133
func (g *Group) AvatarLinkWithSize(size int) string {
3234
if g.Avatar == "" {
3335
return avatars.DefaultAvatarLink()

models/group/group.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"code.gitea.io/gitea/modules/setting"
1717
"code.gitea.io/gitea/modules/structs"
1818
"code.gitea.io/gitea/modules/util"
19+
1920
"xorm.io/builder"
2021
)
2122

@@ -129,8 +130,12 @@ func (g *Group) LoadOwner(ctx context.Context) error {
129130
}
130131

131132
func (g *Group) CanAccess(ctx context.Context, userID int64) (bool, error) {
133+
return g.CanAccessAtLevel(ctx, userID, perm.AccessModeRead)
134+
}
135+
136+
func (g *Group) CanAccessAtLevel(ctx context.Context, userID int64, level perm.AccessMode) (bool, error) {
132137
return db.GetEngine(ctx).
133-
Where(UserOrgTeamPermCond("id", userID, perm.AccessModeRead)).Table("repo_group").Exist()
138+
Where(UserOrgTeamPermCond("id", userID, level)).Table("repo_group").Exist()
134139
}
135140

136141
func (g *Group) IsOwnedBy(ctx context.Context, userID int64) (bool, error) {

models/group/group_list.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"code.gitea.io/gitea/models/unit"
88
user_model "code.gitea.io/gitea/models/user"
99
"code.gitea.io/gitea/modules/structs"
10+
1011
"xorm.io/builder"
1112
)
1213

models/group/group_team.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package group
22

33
import (
4+
"context"
5+
46
"code.gitea.io/gitea/models/db"
57
"code.gitea.io/gitea/models/perm"
68
"code.gitea.io/gitea/models/unit"
79
"code.gitea.io/gitea/modules/log"
810
"code.gitea.io/gitea/modules/util"
9-
"context"
1011
)
1112

1213
// GroupTeam represents a relation for a team's access to a group

models/group/group_unit.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package group
22

33
import (
4+
"context"
5+
46
"code.gitea.io/gitea/models/db"
57
"code.gitea.io/gitea/models/perm"
68
"code.gitea.io/gitea/models/unit"
7-
"context"
89
)
910

1011
// GroupUnit describes all units of a repository group

models/organization/team_group.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package organization
22

33
import (
4+
"context"
5+
46
"code.gitea.io/gitea/models/db"
57
group_model "code.gitea.io/gitea/models/group"
68
"code.gitea.io/gitea/models/perm"
79
"code.gitea.io/gitea/models/unit"
8-
"context"
910
)
1011

1112
func GetTeamsWithAccessToGroup(ctx context.Context, orgID, groupID int64, mode perm.AccessMode) ([]*Team, error) {

models/perm/access/repo_permission.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
package access
55

66
import (
7-
group_model "code.gitea.io/gitea/models/group"
87
"context"
98
"fmt"
109
"slices"
1110

1211
"code.gitea.io/gitea/models/db"
12+
group_model "code.gitea.io/gitea/models/group"
1313
"code.gitea.io/gitea/models/organization"
1414
perm_model "code.gitea.io/gitea/models/perm"
1515
repo_model "code.gitea.io/gitea/models/repo"

models/shared/group/org_group.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package group
22

33
import (
4+
"context"
5+
46
"code.gitea.io/gitea/models/db"
57
group_model "code.gitea.io/gitea/models/group"
68
organization_model "code.gitea.io/gitea/models/organization"
79
user_model "code.gitea.io/gitea/models/user"
8-
"context"
10+
911
"xorm.io/builder"
1012
)
1113

modules/templates/util_avatar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
package templates
55

66
import (
7-
group_model "code.gitea.io/gitea/models/group"
87
"context"
98
"html"
109
"html/template"
1110
"strconv"
1211

1312
activities_model "code.gitea.io/gitea/models/activities"
1413
"code.gitea.io/gitea/models/avatars"
14+
group_model "code.gitea.io/gitea/models/group"
1515
"code.gitea.io/gitea/models/organization"
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
user_model "code.gitea.io/gitea/models/user"

modules/util/slice.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func SliceNilAsEmpty[T any](a []T) []T {
7878
return a
7979
}
8080

81-
func SliceMap[T any, R any](slice []T, mapper func(it T) R) []R {
81+
func SliceMap[T, R any](slice []T, mapper func(it T) R) []R {
8282
ret := make([]R, 0)
8383
for _, it := range slice {
8484
ret = append(ret, mapper(it))

0 commit comments

Comments
 (0)