Skip to content

Commit 393af89

Browse files
GamerGirlandCoGamerGirlandCo
committed
run formatter and fix lint errors
1 parent 62b8b7f commit 393af89

File tree

26 files changed

+96
-109
lines changed

26 files changed

+96
-109
lines changed

‎models/group/group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (g *Group) Depth(ctx context.Context) (d int) {
194194
d++
195195
pg = pg.ParentGroup
196196
}
197-
return
197+
return d
198198
}
199199

200200
// DisplayLeftMargin generates a value for the left margin

‎models/shared/group/group_item.go‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
package group
22

33
import (
4-
"code.gitea.io/gitea/models/perm"
54
"context"
65
"slices"
76

87
"code.gitea.io/gitea/models/db"
98
group_model "code.gitea.io/gitea/models/group"
9+
"code.gitea.io/gitea/models/perm"
1010
repo_model "code.gitea.io/gitea/models/repo"
1111
"code.gitea.io/gitea/models/unit"
1212
user_model "code.gitea.io/gitea/models/user"
1313
"code.gitea.io/gitea/modules/log"
14+
1415
"xorm.io/builder"
1516
)
1617

17-
// GroupItem - represents an item in a group, either a repository or a subgroup.
18+
// Item - represents an item in a group, either a repository or a subgroup.
1819
// used to display, for example, the group sidebar
19-
type GroupItem interface {
20+
type Item interface {
2021
Link() string
2122
Title() string
22-
Parent() GroupItem
23-
Children(doer *user_model.User) []GroupItem
23+
Parent() Item
24+
Children(doer *user_model.User) []Item
2425
Avatar(ctx context.Context) string
2526
HasChildren(doer *user_model.User) bool
2627
IsGroup() bool
@@ -40,15 +41,15 @@ func (g *groupItemGroup) Title() string {
4041
return g.Group.Name
4142
}
4243

43-
func (g *groupItemGroup) Parent() GroupItem {
44+
func (g *groupItemGroup) Parent() Item {
4445
if g.Group.ParentGroupID == 0 {
4546
return nil
4647
}
4748
group, _ := group_model.GetGroupByID(db.DefaultContext, g.Group.ParentGroupID)
4849
return &groupItemGroup{group}
4950
}
5051

51-
func (g *groupItemGroup) Children(doer *user_model.User) (items []GroupItem) {
52+
func (g *groupItemGroup) Children(doer *user_model.User) (items []Item) {
5253
repos := make([]*repo_model.Repository, 0)
5354
sess := db.GetEngine(db.DefaultContext)
5455
err := sess.Table("repository").
@@ -57,11 +58,11 @@ func (g *groupItemGroup) Children(doer *user_model.User) (items []GroupItem) {
5758
Find(&repos)
5859
if err != nil {
5960
log.Error("%w", err)
60-
return make([]GroupItem, 0)
61+
return make([]Item, 0)
6162
}
6263
err = g.Group.LoadAccessibleSubgroups(db.DefaultContext, false, doer)
6364
if err != nil {
64-
return make([]GroupItem, 0)
65+
return make([]Item, 0)
6566
}
6667
slices.SortStableFunc(g.Group.Subgroups, func(a, b *group_model.Group) int {
6768
return a.SortOrder - b.SortOrder
@@ -97,15 +98,17 @@ func (g *groupItemGroup) ID() int64 {
9798
func (g *groupItemGroup) Sort() int {
9899
return g.Group.SortOrder
99100
}
100-
func GetTopLevelGroupItemList(ctx context.Context, orgID int64, doer *user_model.User) (rootItems []GroupItem) {
101+
102+
func GetTopLevelGroupItemList(ctx context.Context, orgID int64, doer *user_model.User) []Item {
103+
var rootItems []Item
101104
groups, err := group_model.FindGroupsByCond(ctx, &group_model.FindGroupsOptions{
102105
ParentGroupID: 0,
103106
ActorID: doer.ID,
104107
OwnerID: orgID,
105108
}, group_model.
106109
AccessibleGroupCondition(doer, unit.TypeInvalid, perm.AccessModeRead))
107110
if err != nil {
108-
return
111+
return nil
109112
}
110113
repos := make([]*repo_model.Repository, 0)
111114
cond := builder.NewCond().
@@ -115,7 +118,7 @@ func GetTopLevelGroupItemList(ctx context.Context, orgID int64, doer *user_model
115118
sess := db.GetEngine(ctx)
116119
err = sess.Table("repository").Where(cond).Find(&repos)
117120
if err != nil {
118-
return
121+
return nil
119122
}
120123
slices.SortStableFunc(groups, func(a, b *group_model.Group) int {
121124
return a.SortOrder - b.SortOrder
@@ -129,12 +132,12 @@ func GetTopLevelGroupItemList(ctx context.Context, orgID int64, doer *user_model
129132
for _, r := range repos {
130133
rootItems = append(rootItems, &groupItemRepo{r})
131134
}
132-
return
135+
return rootItems
133136
}
134137

135-
func GroupItemHasChild(it GroupItem, other int64, ctx context.Context, doer *user_model.User) bool {
138+
func ItemHasChild(ctx context.Context, it Item, other int64, doer *user_model.User) bool {
136139
for _, item := range it.Children(doer) {
137-
if GroupItemHasChild(item, other, ctx, doer) {
140+
if ItemHasChild(ctx, item, other, doer) {
138141
return true
139142
}
140143
}

‎models/shared/group/repo_item.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
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
repo_model "code.gitea.io/gitea/models/repo"
79
user_model "code.gitea.io/gitea/models/user"
8-
"context"
910
)
1011

1112
type groupItemRepo struct {
@@ -20,16 +21,16 @@ func (repo *groupItemRepo) Title() string {
2021
return repo.Repo.Name
2122
}
2223

23-
func (repo *groupItemRepo) Parent() GroupItem {
24+
func (repo *groupItemRepo) Parent() Item {
2425
if repo.Repo.GroupID == 0 {
2526
return nil
2627
}
2728
group, _ := group_model.GetGroupByID(db.DefaultContext, repo.Repo.GroupID)
2829
return &groupItemGroup{group}
2930
}
3031

31-
func (repo *groupItemRepo) Children(doer *user_model.User) []GroupItem {
32-
return []GroupItem{}
32+
func (repo *groupItemRepo) Children(doer *user_model.User) []Item {
33+
return []Item{}
3334
}
3435

3536
func (repo *groupItemRepo) Avatar(ctx context.Context) string {

‎package-lock.json‎

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"@types/jquery": "3.5.32",
7676
"@types/katex": "0.16.7",
7777
"@types/license-checker-webpack-plugin": "0.2.5",
78+
"@types/object-hash": "3.0.6",
7879
"@types/pdfobject": "2.2.5",
7980
"@types/sortablejs": "1.15.8",
8081
"@types/swagger-ui-dist": "3.30.6",

‎routers/web/group/home.go‎

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

33
import (
4+
"net/http"
5+
46
"code.gitea.io/gitea/models/db"
57
"code.gitea.io/gitea/models/organization"
68
repo_model "code.gitea.io/gitea/models/repo"
79
shared_group_model "code.gitea.io/gitea/models/shared/group"
810
"code.gitea.io/gitea/modules/setting"
911
shared_group "code.gitea.io/gitea/routers/web/shared/group"
1012
"code.gitea.io/gitea/services/context"
11-
"net/http"
1213
)
1314

1415
const (

‎routers/web/group/new.go‎

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

33
import (
4-
"code.gitea.io/gitea/models/perm"
54
"net/http"
65

76
"code.gitea.io/gitea/models/db"
87
group_model "code.gitea.io/gitea/models/group"
8+
"code.gitea.io/gitea/models/perm"
99
unit_model "code.gitea.io/gitea/models/unit"
1010
"code.gitea.io/gitea/modules/log"
1111
"code.gitea.io/gitea/modules/optional"
@@ -59,6 +59,7 @@ func NewGroup(ctx *context.Context) {
5959
ctx.Data["Groups"] = groups
6060
ctx.HTML(http.StatusOK, tplGroupNew)
6161
}
62+
6263
func NewGroupPost(ctx *context.Context) {
6364
form := web.GetForm(ctx).(*forms.CreateGroupForm)
6465
log.GetLogger(log.DEFAULT).Info("what? %+v", form)

‎routers/web/group/search.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
group_service "code.gitea.io/gitea/services/group"
1515
)
1616

17-
func toSearchRepoOptions(ctx *context.Context) (opts *repo_model.SearchRepoOptions) {
17+
func toSearchRepoOptions(ctx *context.Context) *repo_model.SearchRepoOptions {
1818
page := ctx.FormInt("page")
19-
opts = &repo_model.SearchRepoOptions{
19+
opts := &repo_model.SearchRepoOptions{
2020
ListOptions: db.ListOptions{
2121
Page: page,
2222
PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")),
@@ -91,16 +91,16 @@ func toSearchRepoOptions(ctx *context.Context) (opts *repo_model.SearchRepoOptio
9191
return nil
9292
}
9393
}
94-
return
94+
return opts
9595
}
9696

9797
func SearchGroup(ctx *context.Context) {
9898
gid := ctx.FormInt64("group_id")
9999
var (
100100
group *group_model.Group
101101
err error
102-
canSee bool = true
103-
oid int64 = ctx.FormInt64("uid")
102+
canSee = true
103+
oid = ctx.FormInt64("uid")
104104
)
105105
if gid > 0 {
106106
group, err = group_model.GetGroupByID(ctx, gid)

‎routers/web/group/setting.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package group
22

33
import (
4+
"errors"
5+
"fmt"
6+
"io"
7+
"net/http"
8+
49
group_model "code.gitea.io/gitea/models/group"
510
repo_model "code.gitea.io/gitea/models/repo"
611
"code.gitea.io/gitea/modules/log"
@@ -15,10 +20,6 @@ import (
1520
group_service "code.gitea.io/gitea/services/group"
1621
repo_service "code.gitea.io/gitea/services/repository"
1722
user_service "code.gitea.io/gitea/services/user"
18-
"errors"
19-
"fmt"
20-
"io"
21-
"net/http"
2223
)
2324

2425
const (

‎routers/web/group/team.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package group
22

33
import (
4+
"net/http"
5+
"strings"
6+
47
"code.gitea.io/gitea/models/db"
58
group_model "code.gitea.io/gitea/models/group"
69
org_model "code.gitea.io/gitea/models/organization"
@@ -14,8 +17,6 @@ import (
1417
"code.gitea.io/gitea/services/convert"
1518
"code.gitea.io/gitea/services/forms"
1619
group_service "code.gitea.io/gitea/services/group"
17-
"net/http"
18-
"strings"
1920
)
2021

2122
const (

0 commit comments

Comments
 (0)