postfix if the name is already taken
-func getUniqueRepositoryName(ctx context.Context, ownerID int64, name string) string {
+func getUniqueRepositoryName(ctx context.Context, ownerID, groupID int64, name string) string {
uniqueName := name
for i := 1; i < 1000; i++ {
- _, err := repo_model.GetRepositoryByName(ctx, ownerID, uniqueName)
+ _, err := repo_model.GetRepositoryByName(ctx, ownerID, groupID, uniqueName)
if err != nil || repo_model.IsErrRepoNotExist(err) {
return uniqueName
}
diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go
index deb3ae4f3a6f8..d9c68980bbd95 100644
--- a/routers/web/repo/githttp.go
+++ b/routers/web/repo/githttp.go
@@ -104,7 +104,7 @@ func httpBase(ctx *context.Context) *serviceHandler {
}
repoExist := true
- repo, err := repo_model.GetRepositoryByName(ctx, owner.ID, reponame)
+ repo, err := repo_model.GetRepositoryByName(ctx, owner.ID, ctx.PathParamInt64("group_id"), reponame)
if err != nil {
if !repo_model.IsErrRepoNotExist(err) {
ctx.ServerError("GetRepositoryByName", err)
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 1b700aa6da0a4..90cb3dba77a27 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -289,6 +289,7 @@ func CreatePost(ctx *context.Context) {
IsTemplate: form.Template,
TrustModel: repo_model.DefaultTrustModel,
ObjectFormatName: form.ObjectFormatName,
+ GroupID: form.ParentGroupID,
})
if err == nil {
log.Trace("Repository created [%d]: %s/%s", repo.ID, ctxUser.Name, repo.Name)
@@ -477,6 +478,7 @@ func SearchRepo(ctx *context.Context) {
Template: optional.None[bool](),
StarredByID: ctx.FormInt64("starredBy"),
IncludeDescription: ctx.FormBool("includeDesc"),
+ GroupID: ctx.FormInt64("group_id"),
}
if ctx.FormString("template") != "" {
@@ -567,16 +569,18 @@ func SearchRepo(ctx *context.Context) {
for i, repo := range repos {
results[i] = &repo_service.WebSearchRepository{
Repository: &api.Repository{
- ID: repo.ID,
- FullName: repo.FullName(),
- Fork: repo.IsFork,
- Private: repo.IsPrivate,
- Template: repo.IsTemplate,
- Mirror: repo.IsMirror,
- Stars: repo.NumStars,
- HTMLURL: repo.HTMLURL(ctx),
- Link: repo.Link(),
- Internal: !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePrivate,
+ ID: repo.ID,
+ FullName: repo.FullName(),
+ Fork: repo.IsFork,
+ Private: repo.IsPrivate,
+ Template: repo.IsTemplate,
+ Mirror: repo.IsMirror,
+ Stars: repo.NumStars,
+ HTMLURL: repo.HTMLURL(ctx),
+ Link: repo.Link(),
+ Internal: !repo.IsPrivate && repo.Owner.Visibility == api.VisibleTypePrivate,
+ GroupSortOrder: repo.GroupSortOrder,
+ GroupID: repo.GroupID,
},
}
diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go
index af6708e841f46..b0b346e6b9b08 100644
--- a/routers/web/repo/setting/lfs.go
+++ b/routers/web/repo/setting/lfs.go
@@ -271,7 +271,7 @@ func LFSFileGet(ctx *context.Context) {
ctx.Data["IsTextFile"] = st.IsText()
ctx.Data["FileSize"] = meta.Size
// FIXME: the last field is the URL-base64-encoded filename, it should not be "direct"
- ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s/%s.git/info/lfs/objects/%s/%s", setting.AppURL, url.PathEscape(ctx.Repo.Repository.OwnerName), url.PathEscape(ctx.Repo.Repository.Name), url.PathEscape(meta.Oid), "direct")
+ ctx.Data["RawFileLink"] = fmt.Sprintf("%s/%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, url.PathEscape(ctx.Repo.Repository.OwnerName), url.PathEscape(ctx.Repo.Repository.Name), url.PathEscape(meta.Oid), "direct")
switch {
case st.IsRepresentableAsText():
if meta.Size >= setting.UI.MaxDisplayFileSize {
diff --git a/routers/web/repo/star.go b/routers/web/repo/star.go
index 00c06b7d02d84..f9301e15d0192 100644
--- a/routers/web/repo/star.go
+++ b/routers/web/repo/star.go
@@ -21,7 +21,7 @@ func ActionStar(ctx *context.Context) {
}
ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
- ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.Name)
+ ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.GroupID, ctx.Repo.Repository.Name)
if err != nil {
ctx.ServerError("GetRepositoryByName", err)
return
diff --git a/routers/web/repo/watch.go b/routers/web/repo/watch.go
index 70c548b8cea7f..c00b1d1b1fcfa 100644
--- a/routers/web/repo/watch.go
+++ b/routers/web/repo/watch.go
@@ -21,7 +21,7 @@ func ActionWatch(ctx *context.Context) {
}
ctx.Data["IsWatchingRepo"] = repo_model.IsWatching(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
- ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.Name)
+ ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.GroupID, ctx.Repo.Repository.Name)
if err != nil {
ctx.ServerError("GetRepositoryByName", err)
return
diff --git a/routers/web/shared/group/header.go b/routers/web/shared/group/header.go
new file mode 100644
index 0000000000000..7aac072ab8071
--- /dev/null
+++ b/routers/web/shared/group/header.go
@@ -0,0 +1,24 @@
+package group
+
+import (
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/modules/optional"
+ "code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/services/context"
+)
+
+func LoadHeaderCount(ctx *context.Context) error {
+ repoCount, err := repo_model.CountRepository(ctx, repo_model.SearchRepoOptions{
+ Actor: ctx.Doer,
+ Private: ctx.IsSigned,
+ GroupID: ctx.RepoGroup.Group.ID,
+ Collaborate: optional.Some(false),
+ IncludeDescription: setting.UI.SearchRepoDescription,
+ })
+ if err != nil {
+ return err
+ }
+ ctx.Data["RepoCount"] = repoCount
+
+ return nil
+}
diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go
index 2bd0abc4c03f7..4f928b233925b 100644
--- a/routers/web/shared/user/header.go
+++ b/routers/web/shared/user/header.go
@@ -93,7 +93,7 @@ func prepareContextForProfileBigAvatar(ctx *context.Context) {
func FindOwnerProfileReadme(ctx *context.Context, doer *user_model.User, optProfileRepoName ...string) (profileDbRepo *repo_model.Repository, profileReadmeBlob *git.Blob) {
profileRepoName := util.OptionalArg(optProfileRepoName, RepoNameProfile)
- profileDbRepo, err := repo_model.GetRepositoryByName(ctx, ctx.ContextUser.ID, profileRepoName)
+ profileDbRepo, err := repo_model.GetRepositoryByName(ctx, ctx.ContextUser.ID, ctx.PathParamInt64("group_id"), profileRepoName)
if err != nil {
if !repo_model.IsErrRepoNotExist(err) {
log.Error("FindOwnerProfileReadme failed to GetRepositoryByName: %v", err)
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index b53a3daedb5ea..592bca592b7ea 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -110,7 +110,7 @@ func Dashboard(ctx *context.Context) {
}
if setting.Service.EnableUserHeatmap {
- data, err := activities_model.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.Doer)
+ data, err := activities_model.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.RepoGroup.Group, ctx.Doer)
if err != nil {
ctx.ServerError("GetUserHeatmapDataByUserTeam", err)
return
@@ -122,6 +122,7 @@ func Dashboard(ctx *context.Context) {
feeds, count, err := feed_service.GetFeedsForDashboard(ctx, activities_model.GetFeedsOptions{
RequestedUser: ctxUser,
RequestedTeam: ctx.Org.Team,
+ RequestedGroup: ctx.RepoGroup.Group,
Actor: ctx.Doer,
IncludePrivate: true,
OnlyPerformedBy: false,
@@ -170,6 +171,9 @@ func Milestones(ctx *context.Context) {
Archived: optional.Some(false),
HasMilestones: optional.Some(true), // Just needs display repos has milestones
}
+ if ctx.RepoGroup.Group != nil {
+ repoOpts.GroupID = ctx.RepoGroup.Group.ID
+ }
if ctxUser.IsOrganization() && ctx.Org.Team != nil {
repoOpts.TeamID = ctx.Org.Team.ID
@@ -474,6 +478,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
if opts.Team != nil {
repoOpts.TeamID = opts.Team.ID
}
+ if ctx.RepoGroup.Group != nil {
+ repoOpts.GroupID = ctx.RepoGroup.Group.ID
+ }
accessibleRepos := container.Set[int64]{}
{
ids, _, err := repo_model.SearchRepositoryIDs(ctx, repoOpts)
diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go
index 171c1933d4f49..08d6db7c31157 100644
--- a/routers/web/user/setting/adopt.go
+++ b/routers/web/user/setting/adopt.go
@@ -5,6 +5,8 @@ package setting
import (
"path/filepath"
+ "strconv"
+ "strings"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
@@ -24,13 +26,17 @@ func AdoptOrDeleteRepository(ctx *context.Context) {
ctx.Data["allowDelete"] = allowDelete
dir := ctx.FormString("id")
+ var gid int64
+ if len(strings.Split(dir, "/")) > 1 {
+ gid, _ = strconv.ParseInt(strings.Split(dir, "/")[1], 10, 64)
+ }
action := ctx.FormString("action")
ctxUser := ctx.Doer
root := user_model.UserPath(ctxUser.LowerName)
// check not a repo
- has, err := repo_model.IsRepositoryModelExist(ctx, ctxUser, dir)
+ has, err := repo_model.IsRepositoryModelExist(ctx, ctxUser, dir, 0)
if err != nil {
ctx.ServerError("IsRepositoryExist", err)
return
@@ -53,7 +59,7 @@ func AdoptOrDeleteRepository(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("repo.adopt_preexisting_success", dir))
} else if action == "delete" && allowDelete {
- if err := repo_service.DeleteUnadoptedRepository(ctx, ctxUser, ctxUser, dir); err != nil {
+ if err := repo_service.DeleteUnadoptedRepository(ctx, ctxUser, ctxUser, dir, gid); err != nil {
ctx.ServerError("repository.AdoptRepository", err)
return
}
diff --git a/routers/web/web.go b/routers/web/web.go
index 4a274c171a3a0..926945db40268 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -30,6 +30,7 @@ import (
"code.gitea.io/gitea/routers/web/events"
"code.gitea.io/gitea/routers/web/explore"
"code.gitea.io/gitea/routers/web/feed"
+ "code.gitea.io/gitea/routers/web/group"
"code.gitea.io/gitea/routers/web/healthcheck"
"code.gitea.io/gitea/routers/web/misc"
"code.gitea.io/gitea/routers/web/org"
@@ -876,6 +877,7 @@ func registerWebRoutes(m *web.Router) {
m.Group("/org", func() {
m.Group("/{org}", func() {
+ m.Get("/-/search_team_candidates", optExploreSignIn, group.SearchTeamCandidates)
m.Get("/members", org.Members)
}, context.OrgAssignment(context.OrgAssignmentOptions{}))
}, optSignIn)
@@ -895,14 +897,43 @@ func registerWebRoutes(m *web.Router) {
m.Group("/{org}", func() {
m.Get("/dashboard", user.Dashboard)
m.Get("/dashboard/{team}", user.Dashboard)
+ m.Get("/dashboard/group/{group_id}", ctxDataSet("PageIsGroupDashboard", true), context.GroupAssignment(context.GroupAssignmentOptions{RequireMember: true}), user.Dashboard)
m.Get("/issues", user.Issues)
m.Get("/issues/{team}", user.Issues)
+ m.Get("/issues/group/{group_id}", context.GroupAssignment(context.GroupAssignmentOptions{RequireMember: true}), user.Issues)
m.Get("/pulls", user.Pulls)
m.Get("/pulls/{team}", user.Pulls)
+ m.Get("/pulls/group/{group_id}", context.GroupAssignment(context.GroupAssignmentOptions{RequireMember: true}), user.Pulls)
m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones)
m.Get("/milestones/{team}", reqMilestonesDashboardPageEnabled, user.Milestones)
+ m.Get("/milestones/group/{group_id}", reqMilestonesDashboardPageEnabled, user.Milestones)
m.Post("/members/action/{action}", org.MembersAction)
m.Get("/teams", org.Teams)
+
+ m.Group("/groups", func() {
+ m.Combo("/new").
+ Get(group.NewGroup).
+ Post(web.Bind(forms.CreateGroupForm{}), group.NewGroupPost)
+ m.Group("/{group_id}", func() {
+ m.Get("/teams", group.Teams)
+ m.Post("/teams/add", group.TeamAddPost)
+ m.Combo("/teams/{team}/edit").
+ Get(group.EditTeam).
+ Post(web.Bind(forms.CreateGroupTeamForm{}), group.EditTeamPost)
+ m.Post("/teams/{team}/remove", group.TeamRemove)
+ m.Group("/settings", func() {
+ m.Combo("").
+ Get(group.Settings).
+ Post(web.Bind(forms.UpdateGroupSettingForm{}), group.SettingsPost)
+ m.Post("/avatar", web.Bind(forms.AvatarForm{}), group.SettingsAvatar)
+ m.Post("/avatar/delete", group.SettingsDeleteAvatar)
+ }, ctxDataSet("PageIsGroupSettings", true))
+ }, context.GroupAssignment(context.GroupAssignmentOptions{
+ RequireMember: true,
+ RequireOwner: false,
+ RequireGroupAdmin: true,
+ }))
+ })
}, context.OrgAssignment(context.OrgAssignmentOptions{RequireMember: true, RequireTeamMember: true}))
m.Group("/{org}", func() {
@@ -1001,6 +1032,11 @@ func registerWebRoutes(m *web.Router) {
}, reqSignIn)
// end "/org": most org routes
+ m.Group("/group", func() {
+ m.Get("/search", group.SearchGroup)
+ }, reqSignIn)
+ // end "/group": search
+
m.Group("/repo", func() {
m.Get("/create", repo.Create)
m.Post("/create", web.Bind(forms.CreateRepoForm{}), repo.CreatePost)
@@ -1070,15 +1106,29 @@ func registerWebRoutes(m *web.Router) {
}, reqUnitAccess(unit.TypeCode, perm.AccessModeRead, false), individualPermsChecker)
}, optSignIn, context.UserAssignmentWeb(), context.OrgAssignment(context.OrgAssignmentOptions{}))
// end "/{username}/-": packages, projects, code
+ m.Group("/{username}/groups", func() {
+ m.Group("/{group_id}", func() {
+ m.Get("", group.Home)
+ }, context.GroupAssignment(context.GroupAssignmentOptions{}))
+ }, optSignIn, context.UserAssignmentWeb(), context.OrgAssignment(context.OrgAssignmentOptions{}))
- m.Group("/{username}/{reponame}/-", func() {
+ m.Group("/{username}/groups", func() {
+ m.Post("/items/move", group.MoveGroupItem)
+ }, context.UserAssignmentWeb(), context.OrgAssignment(context.OrgAssignmentOptions{
+ RequireMember: true,
+ }))
+ // end "/{username}/groups"
+
+ repoDashFn := func() {
m.Group("/migrate", func() {
m.Get("/status", repo.MigrateStatus)
})
- }, optSignIn, context.RepoAssignment, reqUnitCodeReader)
- // end "/{username}/{reponame}/-": migrate
+ }
+ m.Group("/{username}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
+ m.Group("/{username}/group/{group_id}/{reponame}/-", repoDashFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
+ // end "/{username}/{group_id}/{reponame}/-": migrate
- m.Group("/{username}/{reponame}/settings", func() {
+ settingsFn := func() {
m.Group("", func() {
m.Combo("").Get(repo_setting.Settings).
Post(web.Bind(forms.RepoSettingForm{}), repo_setting.SettingsPost)
@@ -1166,18 +1216,24 @@ func registerWebRoutes(m *web.Router) {
m.Post("/retry", repo.MigrateRetryPost)
m.Post("/cancel", repo.MigrateCancelPost)
})
- },
+ }
+ m.Group("/{username}/{reponame}/settings", settingsFn,
+ reqSignIn, context.RepoAssignment, reqRepoAdmin,
+ ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
+ )
+ m.Group("/{username}/group/{group_id}/{reponame}/settings", settingsFn,
reqSignIn, context.RepoAssignment, reqRepoAdmin,
ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer),
)
- // end "/{username}/{reponame}/settings"
+ // end "/{username}/{group_id}/{reponame}/settings"
- // user/org home, including rss feeds like "/{username}/{reponame}.rss"
+ // user/org home, including rss feeds like "/{username}/{group_id}/{reponame}.rss"
m.Get("/{username}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
+ m.Get("/{username}/group/{group_id}/{reponame}", optSignIn, context.RepoAssignment, context.RepoRefByType(git.RefTypeBranch), repo.SetEditorconfigIfExists, repo.Home)
m.Post("/{username}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
-
- m.Group("/{username}/{reponame}", func() {
+ m.Post("/{username}/group/{group_id}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
+ rootRepoFn := func() {
m.Get("/find/*", repo.FindFiles)
m.Group("/tree-list", func() {
m.Get("/branch/*", context.RepoRefByType(git.RefTypeBranch), repo.TreeList)
@@ -1194,11 +1250,13 @@ func registerWebRoutes(m *web.Router) {
Get(repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.CompareDiff).
Post(reqSignIn, context.RepoMustNotBeArchived(), reqUnitPullsReader, repo.MustAllowPulls, web.Bind(forms.CreateIssueForm{}), repo.SetWhitespaceBehavior, repo.CompareAndPullRequestPost)
m.Get("/pulls/new/*", repo.PullsNewRedirect)
- }, optSignIn, context.RepoAssignment, reqUnitCodeReader)
- // end "/{username}/{reponame}": repo code: find, compare, list
+ }
+ m.Group("/{username}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
+ m.Group("/{username}/group/{group_id}/{reponame}", rootRepoFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
+ // end "/{username}/{group_id}/{reponame}": repo code: find, compare, list
addIssuesPullsViewRoutes := func() {
- // for /{username}/{reponame}/issues" or "/{username}/{reponame}/pulls"
+ // for /{username}/{group_id}/{reponame}/issues" or "/{username}/{group_id}/{reponame}/pulls"
m.Get("/posters", repo.IssuePullPosters)
m.Group("/{index}", func() {
m.Get("/info", repo.GetIssueInfo)
@@ -1212,25 +1270,32 @@ func registerWebRoutes(m *web.Router) {
})
}
// FIXME: many "pulls" requests are sent to "issues" endpoints correctly, so the issue endpoints have to tolerate pull request permissions at the moment
+ m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
m.Group("/{username}/{reponame}/{type:issues}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypePullRequests))
+ m.Group("/{username}/group/{group_id}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
m.Group("/{username}/{reponame}/{type:pulls}", addIssuesPullsViewRoutes, optSignIn, context.RepoAssignment, reqUnitPullsReader)
- m.Group("/{username}/{reponame}", func() {
+ repoIssueAttachmentFn := func() {
m.Get("/comments/{id}/attachments", repo.GetCommentAttachments)
m.Get("/labels", repo.RetrieveLabelsForList, repo.Labels)
m.Get("/milestones", repo.Milestones)
m.Get("/milestone/{id}", repo.MilestoneIssuesAndPulls)
m.Get("/issues/suggestions", repo.IssueSuggestions)
- }, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
- // end "/{username}/{reponame}": view milestone, label, issue, pull, etc
+ }
- m.Group("/{username}/{reponame}/{type:issues}", func() {
+ m.Group("/{username}/group/{group_id}/{reponame}", repoIssueAttachmentFn, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
+ m.Group("/{username}/{reponame}", repoIssueAttachmentFn, optSignIn, context.RepoAssignment, reqRepoIssuesOrPullsReader) // issue/pull attachments, labels, milestones
+ // end "/{username}/{group_id}/{reponame}": view milestone, label, issue, pull, etc
+
+ issueViewFn := func() {
m.Get("", repo.Issues)
m.Get("/{index}", repo.ViewIssue)
- }, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
- // end "/{username}/{reponame}": issue/pull list, issue/pull view, external tracker
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
+ m.Group("/{username}/{reponame}/{type:issues}", issueViewFn, optSignIn, context.RepoAssignment, context.RequireUnitReader(unit.TypeIssues, unit.TypeExternalTracker))
+ // end "/{username}/{group_id}/{reponame}": issue/pull list, issue/pull view, external tracker
- m.Group("/{username}/{reponame}", func() { // edit issues, pulls, labels, milestones, etc
+ editIssueFn := func() { // edit issues, pulls, labels, milestones, etc
m.Group("/issues", func() {
m.Group("/new", func() {
m.Combo("").Get(repo.NewIssue).
@@ -1241,7 +1306,7 @@ func registerWebRoutes(m *web.Router) {
}, reqUnitIssuesReader)
addIssuesPullsUpdateRoutes := func() {
- // for "/{username}/{reponame}/issues" or "/{username}/{reponame}/pulls"
+ // for "/{username}/{group_id}/{reponame}/issues" or "/{username}/{group_id}/{reponame}/pulls"
m.Group("/{index}", func() {
m.Post("/title", repo.UpdateIssueTitle)
m.Post("/content", repo.UpdateIssueContent)
@@ -1317,10 +1382,12 @@ func registerWebRoutes(m *web.Router) {
m.Post("/resolve_conversation", repo.SetShowOutdatedComments, repo.UpdateResolveConversation)
}, reqUnitPullsReader)
m.Post("/pull/{index}/target_branch", reqUnitPullsReader, repo.UpdatePullRequestTarget)
- }, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
- // end "/{username}/{reponame}": create or edit issues, pulls, labels, milestones
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
+ m.Group("/{username}/{reponame}", editIssueFn, reqSignIn, context.RepoAssignment, context.RepoMustNotBeArchived())
+ // end "/{username}/{group_id}/{reponame}": create or edit issues, pulls, labels, milestones
- m.Group("/{username}/{reponame}", func() { // repo code (at least "code reader")
+ codeFn := func() { // repo code (at least "code reader")
m.Group("", func() {
m.Group("", func() {
// "GET" requests only need "code reader" permission, "POST" requests need "code writer" permission.
@@ -1368,10 +1435,12 @@ func registerWebRoutes(m *web.Router) {
}, context.RepoMustNotBeArchived(), reqRepoCodeWriter, repo.MustBeNotEmpty)
m.Combo("/fork").Get(repo.Fork).Post(web.Bind(forms.CreateRepoForm{}), repo.ForkPost)
- }, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
- // end "/{username}/{reponame}": repo code
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
+ m.Group("/{username}/{reponame}", codeFn, reqSignIn, context.RepoAssignment, reqUnitCodeReader)
+ // end "/{username}/{group_id}/{reponame}": repo code
- m.Group("/{username}/{reponame}", func() { // repo tags
+ repoTagFn := func() { // repo tags
m.Group("/tags", func() {
m.Get("", context.RepoRefByDefaultBranch() /* for the "commits" tab */, repo.TagsList)
m.Get(".rss", feedEnabled, repo.TagsListFeedRSS)
@@ -1379,10 +1448,12 @@ func registerWebRoutes(m *web.Router) {
m.Get("/list", repo.GetTagList)
}, ctxDataSet("EnableFeed", setting.Other.EnableFeed))
m.Post("/tags/delete", reqSignIn, reqRepoCodeWriter, context.RepoMustNotBeArchived(), repo.DeleteTag)
- }, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
- // end "/{username}/{reponame}": repo tags
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
+ m.Group("/{username}/{reponame}", repoTagFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqUnitCodeReader)
+ // end "/{username}/{group_id}/{reponame}": repo tags
- m.Group("/{username}/{reponame}", func() { // repo releases
+ repoReleaseFn := func() { // repo releases
m.Group("/releases", func() {
m.Get("", repo.Releases)
m.Get(".rss", feedEnabled, repo.ReleasesFeedRSS)
@@ -1403,25 +1474,33 @@ func registerWebRoutes(m *web.Router) {
m.Get("/edit/*", repo.EditRelease)
m.Post("/edit/*", web.Bind(forms.EditReleaseForm{}), repo.EditReleasePost)
}, reqSignIn, context.RepoMustNotBeArchived(), reqRepoReleaseWriter, repo.CommitInfoCache)
- }, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
- // end "/{username}/{reponame}": repo releases
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
+ m.Group("/{username}/{reponame}", repoReleaseFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoReleaseReader)
+ // end "/{username}/{group_id}/{reponame}": repo releases
- m.Group("/{username}/{reponame}", func() { // to maintain compatibility with old attachments
+ repoAttachmentsFn := func() { // to maintain compatibility with old attachments
m.Get("/attachments/{uuid}", repo.GetAttachment)
- }, optSignIn, context.RepoAssignment)
- // end "/{username}/{reponame}": compatibility with old attachments
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
+ m.Group("/{username}/{reponame}", repoAttachmentsFn, optSignIn, context.RepoAssignment)
+ // end "/{username}/{group_id}/{reponame}": compatibility with old attachments
- m.Group("/{username}/{reponame}", func() {
+ repoTopicFn := func() {
m.Post("/topics", repo.TopicsPost)
- }, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
+ m.Group("/{username}/{reponame}", repoTopicFn, context.RepoAssignment, reqRepoAdmin, context.RepoMustNotBeArchived())
- m.Group("/{username}/{reponame}", func() {
+ repoPackageFn := func() {
if setting.Packages.Enabled {
m.Get("/packages", repo.Packages)
}
- }, optSignIn, context.RepoAssignment)
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
+ m.Group("/{username}/{reponame}", repoPackageFn, optSignIn, context.RepoAssignment)
- m.Group("/{username}/{reponame}/projects", func() {
+ repoProjectsFn := func() {
m.Get("", repo.Projects)
m.Get("/{id}", repo.ViewProject)
m.Group("", func() { //nolint:dupl // duplicates lines 1034-1054
@@ -1445,10 +1524,12 @@ func registerWebRoutes(m *web.Router) {
})
})
}, reqRepoProjectsWriter, context.RepoMustNotBeArchived())
- }, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
- // end "/{username}/{reponame}/projects"
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
+ m.Group("/{username}/{reponame}/projects", repoProjectsFn, optSignIn, context.RepoAssignment, reqRepoProjectsReader, repo.MustEnableRepoProjects)
+ // end "/{username}/{group_id}/{reponame}/projects"
- m.Group("/{username}/{reponame}/actions", func() {
+ repoActionsFn := func() {
m.Get("", actions.List)
m.Post("/disable", reqRepoAdmin, actions.DisableWorkflowFile)
m.Post("/enable", reqRepoAdmin, actions.EnableWorkflowFile)
@@ -1477,10 +1558,12 @@ func registerWebRoutes(m *web.Router) {
m.Group("/workflows/{workflow_name}", func() {
m.Get("/badge.svg", actions.GetWorkflowBadge)
})
- }, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
- // end "/{username}/{reponame}/actions"
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
+ m.Group("/{username}/{reponame}/actions", repoActionsFn, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions)
+ // end "/{username}/{group_id}/{reponame}/actions"
- m.Group("/{username}/{reponame}/wiki", func() {
+ repoWikiFn := func() {
m.Combo("").
Get(repo.Wiki).
Post(context.RepoMustNotBeArchived(), reqSignIn, reqUnitWikiWriter, web.Bind(forms.NewWikiForm{}), repo.WikiPost)
@@ -1491,13 +1574,18 @@ func registerWebRoutes(m *web.Router) {
m.Get("/commit/{sha:[a-f0-9]{7,64}}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.Diff)
m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff)
m.Get("/raw/*", repo.WikiRaw)
- }, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
+ ctx.Data["PageIsWiki"] = true
+ ctx.Data["CloneButtonOriginLink"] = ctx.Repo.Repository.WikiCloneLink(ctx, ctx.Doer)
+ })
+ m.Group("/{username}/{reponame}/wiki", repoWikiFn, optSignIn, context.RepoAssignment, repo.MustEnableWiki, reqUnitWikiReader, func(ctx *context.Context) {
ctx.Data["PageIsWiki"] = true
ctx.Data["CloneButtonOriginLink"] = ctx.Repo.Repository.WikiCloneLink(ctx, ctx.Doer)
})
- // end "/{username}/{reponame}/wiki"
+ // end "/{username}/{group_id}/{reponame}/wiki"
- m.Group("/{username}/{reponame}/activity", func() {
+ activityFn := func() {
// activity has its own permission checks
m.Get("", repo.Activity)
m.Get("/{period}", repo.Activity)
@@ -1516,13 +1604,18 @@ func registerWebRoutes(m *web.Router) {
m.Get("/data", repo.CodeFrequencyData) // "recent-commits" also uses the same data as "code-frequency"
})
}, reqUnitCodeReader)
- },
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}/activity", activityFn,
optSignIn, context.RepoAssignment, repo.MustBeNotEmpty,
context.RequireUnitReader(unit.TypeCode, unit.TypeIssues, unit.TypePullRequests, unit.TypeReleases),
)
- // end "/{username}/{reponame}/activity"
+ m.Group("/{username}/{reponame}/activity", activityFn,
+ optSignIn, context.RepoAssignment, repo.MustBeNotEmpty,
+ context.RequireUnitReader(unit.TypeCode, unit.TypeIssues, unit.TypePullRequests, unit.TypeReleases),
+ )
+ // end "/{username}/{group_id}/{reponame}/activity"
- m.Group("/{username}/{reponame}", func() {
+ repoPullFn := func() {
m.Get("/{type:pulls}", repo.Issues)
m.Group("/{type:pulls}/{index}", func() {
m.Get("", repo.SetWhitespaceBehavior, repo.GetPullDiffStats, repo.ViewIssue)
@@ -1549,10 +1642,12 @@ func registerWebRoutes(m *web.Router) {
}, context.RepoMustNotBeArchived())
})
})
- }, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
- // end "/{username}/{reponame}/pulls/{index}": repo pull request
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
+ m.Group("/{username}/{reponame}", repoPullFn, optSignIn, context.RepoAssignment, repo.MustAllowPulls, reqUnitPullsReader)
+ // end "/{username}/{group_id}/{reponame}/pulls/{index}": repo pull request
- m.Group("/{username}/{reponame}", func() {
+ repoCodeFn := func() {
m.Group("/activity_author_data", func() {
m.Get("", repo.ActivityAuthors)
m.Get("/{period}", repo.ActivityAuthors)
@@ -1631,21 +1726,25 @@ func registerWebRoutes(m *web.Router) {
m.Get("/forks", repo.Forks)
m.Get("/commit/{sha:([a-f0-9]{7,64})}.{ext:patch|diff}", repo.MustBeNotEmpty, repo.RawDiff)
m.Post("/lastcommit/*", context.RepoRefByType(git.RefTypeCommit), repo.LastCommit)
- }, optSignIn, context.RepoAssignment, reqUnitCodeReader)
- // end "/{username}/{reponame}": repo code
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
+ m.Group("/{username}/{reponame}", repoCodeFn, optSignIn, context.RepoAssignment, reqUnitCodeReader)
+ // end "/{username}/{group_id}/{reponame}": repo code
- m.Group("/{username}/{reponame}", func() {
+ fn := func() {
m.Get("/stars", starsEnabled, repo.Stars)
m.Get("/watchers", repo.Watchers)
m.Get("/search", reqUnitCodeReader, repo.Search)
m.Post("/action/{action:star|unstar}", reqSignIn, starsEnabled, repo.ActionStar)
m.Post("/action/{action:watch|unwatch}", reqSignIn, repo.ActionWatch)
m.Post("/action/{action:accept_transfer|reject_transfer}", reqSignIn, repo.ActionTransfer)
- }, optSignIn, context.RepoAssignment)
+ }
+ m.Group("/{username}/group/{group_id}/{reponame}", fn, optSignIn, context.RepoAssignment)
+ m.Group("/{username}/{reponame}", fn, optSignIn, context.RepoAssignment)
- common.AddOwnerRepoGitLFSRoutes(m, optSignInIgnoreCsrf, lfsServerEnabled) // "/{username}/{reponame}/{lfs-paths}": git-lfs support
+ common.AddOwnerRepoGitLFSRoutes(m, optSignInIgnoreCsrf, lfsServerEnabled) // "/{username}/{group_id}/{reponame}/{lfs-paths}": git-lfs support
- addOwnerRepoGitHTTPRouters(m) // "/{username}/{reponame}/{git-paths}": git http support
+ addOwnerRepoGitHTTPRouters(m) // "/{username}/{group_id}/{reponame}/{git-paths}": git http support
m.Group("/notifications", func() {
m.Get("", user.Notifications)
diff --git a/services/context/context.go b/services/context/context.go
index 32ec260aab931..b8ec77854f17c 100644
--- a/services/context/context.go
+++ b/services/context/context.go
@@ -60,9 +60,10 @@ type Context struct {
ContextUser *user_model.User // the user which is being visited, in most cases it differs from Doer
- Repo *Repository
- Org *Organization
- Package *Package
+ RepoGroup *RepoGroup
+ Repo *Repository
+ Org *Organization
+ Package *Package
}
type TemplateContext map[string]any
@@ -129,10 +130,11 @@ func NewWebContext(base *Base, render Render, session session.Store) *Context {
Render: render,
Session: session,
- Cache: cache.GetCache(),
- Link: setting.AppSubURL + strings.TrimSuffix(base.Req.URL.EscapedPath(), "/"),
- Repo: &Repository{PullRequest: &PullRequest{}},
- Org: &Organization{},
+ Cache: cache.GetCache(),
+ Link: setting.AppSubURL + strings.TrimSuffix(base.Req.URL.EscapedPath(), "/"),
+ Repo: &Repository{PullRequest: &PullRequest{}},
+ Org: &Organization{},
+ RepoGroup: &RepoGroup{},
}
ctx.TemplateContext = NewTemplateContextForWeb(ctx)
ctx.Flash = &middleware.Flash{DataStore: ctx, Values: url.Values{}}
diff --git a/services/context/group.go b/services/context/group.go
new file mode 100644
index 0000000000000..027417257ceb8
--- /dev/null
+++ b/services/context/group.go
@@ -0,0 +1,281 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package context
+
+import (
+ "context"
+ "strings"
+
+ group_model "code.gitea.io/gitea/models/group"
+ "code.gitea.io/gitea/models/organization"
+ "code.gitea.io/gitea/models/perm"
+ shared_group "code.gitea.io/gitea/models/shared/group"
+ "code.gitea.io/gitea/models/unit"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/markup"
+ "code.gitea.io/gitea/modules/markup/markdown"
+ "code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/structs"
+)
+
+type RepoGroup struct {
+ IsOwner bool
+ IsMember bool
+ IsGroupAdmin bool
+ Group *group_model.Group
+ GroupLink string
+ OrgGroupLink string
+ CanCreateRepoOrGroup bool
+ Team *organization.Team
+ Teams []*organization.Team
+ GroupTeam *group_model.RepoGroupTeam
+}
+
+func (g *RepoGroup) CanWriteUnit(ctx *Context, unitType unit.Type) bool {
+ return g.UnitPermission(ctx, ctx.Doer, unitType) >= perm.AccessModeWrite
+}
+
+func (g *RepoGroup) CanReadUnit(ctx *Context, unitType unit.Type) bool {
+ return g.UnitPermission(ctx, ctx.Doer, unitType) >= perm.AccessModeRead
+}
+
+func (g *RepoGroup) UnitPermission(ctx context.Context, doer *user_model.User, unitType unit.Type) perm.AccessMode {
+ if doer != nil {
+ teams, err := organization.GetUserGroupTeams(ctx, g.Group.ID, doer.ID)
+ if err != nil {
+ log.Error("GetUserOrgTeams: %v", err)
+ return perm.AccessModeNone
+ }
+
+ if err := teams.LoadUnits(ctx); err != nil {
+ log.Error("LoadUnits: %v", err)
+ return perm.AccessModeNone
+ }
+
+ if len(teams) > 0 {
+ return teams.UnitMaxAccess(unitType)
+ }
+ }
+
+ if g.Group.Visibility.IsPublic() {
+ return perm.AccessModeRead
+ }
+
+ return perm.AccessModeNone
+}
+
+func GetGroupByParams(ctx *Context) {
+ groupID := ctx.PathParamInt64("group_id")
+
+ var err error
+ ctx.RepoGroup.Group, err = group_model.GetGroupByID(ctx, groupID)
+ if err != nil {
+ if group_model.IsErrGroupNotExist(err) {
+ ctx.NotFound(err)
+ } else {
+ ctx.ServerError("GetUserByName", err)
+ }
+ return
+ }
+ if err = ctx.RepoGroup.Group.LoadAttributes(ctx); err != nil {
+ ctx.ServerError("LoadAttributes", err)
+ }
+}
+
+type GroupAssignmentOptions struct {
+ RequireMember bool
+ RequireOwner bool
+ RequireGroupAdmin bool
+}
+
+func GroupAssignment(args GroupAssignmentOptions) func(ctx *Context) {
+ return func(ctx *Context) {
+ var err error
+
+ if ctx.RepoGroup.Group == nil {
+ GetGroupByParams(ctx)
+ if ctx.Written() {
+ return
+ }
+ }
+
+ group := ctx.RepoGroup.Group
+ if ctx.RepoGroup.Group.Visibility != structs.VisibleTypePublic && !ctx.IsSigned {
+ ctx.NotFound(err)
+ return
+ }
+ if ctx.RepoGroup.Group.Visibility == structs.VisibleTypePrivate {
+ args.RequireMember = true
+ } else if ctx.IsSigned && ctx.Doer.IsRestricted {
+ args.RequireMember = true
+ }
+ if ctx.IsSigned && ctx.Doer.IsAdmin {
+ ctx.RepoGroup.IsOwner = true
+ ctx.RepoGroup.IsMember = true
+ ctx.RepoGroup.IsGroupAdmin = true
+ ctx.RepoGroup.CanCreateRepoOrGroup = true
+ } else if ctx.IsSigned {
+ ctx.RepoGroup.IsOwner, err = group.IsOwnedBy(ctx, ctx.Doer.ID)
+ if err != nil {
+ ctx.ServerError("IsOwnedBy", err)
+ return
+ }
+
+ if ctx.RepoGroup.IsOwner {
+ ctx.RepoGroup.IsMember = true
+ ctx.RepoGroup.IsGroupAdmin = true
+ ctx.RepoGroup.CanCreateRepoOrGroup = true
+ } else {
+ ctx.RepoGroup.IsMember, err = shared_group.IsGroupMember(ctx, group.ID, ctx.Doer)
+ if err != nil {
+ ctx.ServerError("IsOrgMember", err)
+ return
+ }
+ ctx.RepoGroup.CanCreateRepoOrGroup, err = group.CanCreateIn(ctx, ctx.Doer.ID)
+ if err != nil {
+ ctx.ServerError("CanCreateIn", err)
+ return
+ }
+ }
+ } else {
+ ctx.Data["SignedUser"] = &user_model.User{}
+ }
+ if (args.RequireMember && !ctx.RepoGroup.IsMember) ||
+ (args.RequireOwner && !ctx.RepoGroup.IsOwner) {
+ ctx.NotFound(err)
+ return
+ }
+ ctx.Data["EnableFeed"] = setting.Other.EnableFeed
+ ctx.Data["FeedURL"] = ctx.RepoGroup.Group.GroupLink()
+ ctx.Data["IsGroupOwner"] = ctx.RepoGroup.IsOwner
+ ctx.Data["IsGroupMember"] = ctx.RepoGroup.IsMember
+ ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
+ ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
+ ctx.Data["IsPublicMember"] = func(uid int64) bool {
+ is, _ := organization.IsPublicMembership(ctx, ctx.Org.Organization.ID, uid)
+ return is
+ }
+ ctx.Data["CanReadProjects"] = ctx.RepoGroup.CanReadUnit(ctx, unit.TypeProjects)
+ ctx.Data["CanCreateOrgRepo"] = ctx.RepoGroup.CanCreateRepoOrGroup
+
+ ctx.RepoGroup.GroupLink = group.GroupLink()
+ ctx.RepoGroup.OrgGroupLink = group.OrgGroupLink()
+
+ if ctx.RepoGroup.IsMember {
+ shouldSeeAllTeams := false
+ if ctx.RepoGroup.IsOwner {
+ shouldSeeAllTeams = true
+ } else {
+ teams, err := shared_group.GetGroupTeams(ctx, group.ID)
+ if err != nil {
+ ctx.ServerError("GetUserTeams", err)
+ return
+ }
+ for _, team := range teams {
+ if team.IncludesAllRepositories && team.AccessMode >= perm.AccessModeAdmin {
+ shouldSeeAllTeams = true
+ break
+ }
+ }
+ }
+ if shouldSeeAllTeams {
+ ctx.RepoGroup.Teams, err = shared_group.GetGroupTeams(ctx, group.ID)
+ if err != nil {
+ ctx.ServerError("LoadTeams", err)
+ return
+ }
+ } else {
+ ctx.RepoGroup.Teams, err = organization.GetUserGroupTeams(ctx, group.ID, ctx.Doer.ID)
+ if err != nil {
+ ctx.ServerError("GetUserTeams", err)
+ return
+ }
+ }
+ ctx.Data["NumTeams"] = len(ctx.RepoGroup.Teams)
+ }
+
+ teamName := ctx.PathParam("team")
+ if len(teamName) > 0 {
+ teamExists := false
+ for _, team := range ctx.RepoGroup.Teams {
+ if strings.EqualFold(team.LowerName, strings.ToLower(teamName)) {
+ teamExists = true
+ var groupTeam *group_model.RepoGroupTeam
+ groupTeam, err = group_model.FindGroupTeamByTeamID(ctx, group.ID, team.ID)
+ if err != nil {
+ ctx.ServerError("FindGroupTeamByTeamID", err)
+ return
+ }
+ ctx.RepoGroup.GroupTeam = groupTeam
+ ctx.RepoGroup.Team = team
+ ctx.RepoGroup.IsMember = true
+ ctx.Data["Team"] = ctx.RepoGroup.Team
+ break
+ }
+ }
+
+ if !teamExists {
+ ctx.NotFound(err)
+ return
+ }
+
+ ctx.Data["IsTeamMember"] = ctx.RepoGroup.IsMember
+ if args.RequireMember && !ctx.RepoGroup.IsMember {
+ ctx.NotFound(err)
+ return
+ }
+
+ ctx.RepoGroup.IsGroupAdmin = ctx.RepoGroup.Team.IsOwnerTeam() || ctx.RepoGroup.Team.AccessMode >= perm.AccessModeAdmin
+ } else {
+ for _, team := range ctx.RepoGroup.Teams {
+ if team.AccessMode >= perm.AccessModeAdmin {
+ ctx.RepoGroup.IsGroupAdmin = true
+ break
+ }
+ }
+ }
+ if ctx.IsSigned {
+ isAdmin, err := group.IsAdminOf(ctx, ctx.Doer.ID)
+ if err != nil {
+ ctx.ServerError("IsAdminOf", err)
+ return
+ }
+ ctx.RepoGroup.IsGroupAdmin = ctx.RepoGroup.IsGroupAdmin || isAdmin
+ }
+
+ ctx.Data["IsGroupAdmin"] = ctx.RepoGroup.IsGroupAdmin
+ if args.RequireGroupAdmin && !ctx.RepoGroup.IsGroupAdmin {
+ ctx.NotFound(err)
+ return
+ }
+
+ if len(ctx.RepoGroup.Group.Description) != 0 {
+ ctx.Data["RenderedDescription"], err = markdown.RenderString(markup.NewRenderContext(ctx), ctx.RepoGroup.Group.Description)
+ if err != nil {
+ ctx.ServerError("RenderString", err)
+ return
+ }
+ }
+ ctx.Data["Group"] = ctx.RepoGroup.Group
+ ctx.Data["ContextGroup"] = ctx.RepoGroup
+ ctx.Data["Doer"] = ctx.Doer
+ ctx.Data["GroupLink"] = ctx.RepoGroup.Group.GroupLink()
+ ctx.Data["OrgGroupLink"] = ctx.RepoGroup.OrgGroupLink
+ ctx.Data["Breadcrumbs"], err = group_model.GetParentGroupChain(ctx, group.ID)
+ if err != nil {
+ ctx.ServerError("GetParentGroupChain", err)
+ return
+ }
+ }
+}
+
+func groupIsCurrent(ctx *Context) func(groupID int64) bool {
+ return func(groupID int64) bool {
+ if ctx.RepoGroup.Group == nil {
+ return false
+ }
+ return ctx.RepoGroup.Group.ID == groupID
+ }
+}
diff --git a/services/context/org.go b/services/context/org.go
index 1cd89231785aa..9e7046552a433 100644
--- a/services/context/org.go
+++ b/services/context/org.go
@@ -9,6 +9,7 @@ import (
"code.gitea.io/gitea/models/organization"
"code.gitea.io/gitea/models/perm"
+ shared_group "code.gitea.io/gitea/models/shared/group"
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/markup"
@@ -250,5 +251,19 @@ func OrgAssignment(opts OrgAssignmentOptions) func(ctx *Context) {
}
ctx.Data["RenderedDescription"] = content
}
+ ctx.Data["AsGroupItem"] = func(v any) shared_group.Item {
+ if gi, ok := v.(shared_group.Item); ok {
+ return gi
+ }
+ return nil
+ }
+ ctx.Data["GroupNavItems"] = shared_group.GetTopLevelGroupItemList(ctx, ctx.ContextUser.ID, ctx.Doer)
+ ctx.Data["GroupIsCurrent"] = groupIsCurrent(ctx)
+ ctx.Data["GroupHasChild"] = func(it shared_group.Item) bool {
+ if ctx.RepoGroup == nil || ctx.RepoGroup.Group == nil {
+ return false
+ }
+ return shared_group.ItemHasChild(ctx, it, ctx.RepoGroup.Group.ID, ctx.Doer)
+ }
}
}
diff --git a/services/context/repo.go b/services/context/repo.go
index afc6de9b1666d..f5c448b9bcaaa 100644
--- a/services/context/repo.go
+++ b/services/context/repo.go
@@ -5,6 +5,7 @@
package context
import (
+ group_model "code.gitea.io/gitea/models/group"
"context"
"errors"
"fmt"
@@ -12,6 +13,8 @@ import (
"net/http"
"net/url"
"path"
+ "regexp"
+ "strconv"
"strings"
"code.gitea.io/gitea/models/db"
@@ -328,6 +331,7 @@ func ComposeGoGetImport(ctx context.Context, owner, repo string) string {
func EarlyResponseForGoGetMeta(ctx *Context) {
username := ctx.PathParam("username")
reponame := strings.TrimSuffix(ctx.PathParam("reponame"), ".git")
+ groupID := ctx.PathParamInt64("group_id")
if username == "" || reponame == "" {
ctx.PlainText(http.StatusBadRequest, "invalid repository path")
return
@@ -335,15 +339,17 @@ func EarlyResponseForGoGetMeta(ctx *Context) {
var cloneURL string
if setting.Repository.GoGetCloneURLProtocol == "ssh" {
- cloneURL = repo_model.ComposeSSHCloneURL(ctx.Doer, username, reponame)
+ cloneURL = repo_model.ComposeSSHCloneURL(ctx.Doer, username, reponame, groupID)
} else {
- cloneURL = repo_model.ComposeHTTPSCloneURL(ctx, username, reponame)
+ cloneURL = repo_model.ComposeHTTPSCloneURL(ctx, username, reponame, groupID)
}
goImportContent := fmt.Sprintf("%s git %s", ComposeGoGetImport(ctx, username, reponame), cloneURL)
htmlMeta := fmt.Sprintf(`
+
+ {{if .Group}}
+ {{.Group.Name}}
+ {{else}}
+ {{ctx.Locale.Tr "org.groups"}}
+ {{end}}
+
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+
diff --git a/templates/group/dashboard/menu_item.tmpl b/templates/group/dashboard/menu_item.tmpl
new file mode 100644
index 0000000000000..b5f2f6bc4d0a1
--- /dev/null
+++ b/templates/group/dashboard/menu_item.tmpl
@@ -0,0 +1,19 @@
+
+
+ {{.Item.Title}}
+
+
+{{$d := .Depth}}
+{{$one := 1}}
+{{$d1 := Eval $d "+" $one}}
+{{template "group/dashboard/submenu" dict "." . "Items" (.Item.Children .SignedUser) "Depth" $d1}}
diff --git a/templates/group/dashboard/submenu.tmpl b/templates/group/dashboard/submenu.tmpl
new file mode 100644
index 0000000000000..f7437d9411f69
--- /dev/null
+++ b/templates/group/dashboard/submenu.tmpl
@@ -0,0 +1,6 @@
+{{range.Items}}
+{{if .IsGroup}}
+
+{{template "group/dashboard/menu_item" dict "." $ "Item" . "Depth" $.Depth}}
+{{end}}
+{{end}}
diff --git a/templates/group/header.tmpl b/templates/group/header.tmpl
new file mode 100644
index 0000000000000..6d0536b10f0b9
--- /dev/null
+++ b/templates/group/header.tmpl
@@ -0,0 +1,49 @@
+
+
+
+
+ {{ctx.AvatarUtils.Avatar .Group 100 "group-avatar"}}
+
+
+ {{if .RenderedDescription}}
+
{{.RenderedDescription}}
+ {{end}}
+
+
+ {{template "group/header" .}}
+
+
+
+
+ {{template "shared/repo/search" .}}
+ {{template "shared/repo/list" .}}
+ {{template "base/paginate" .}}
+
+
+ {{template "group/sidebar/menu" .}}
+
+
+
+
+
+
diff --git a/templates/group/selector.tmpl b/templates/group/selector.tmpl
new file mode 100644
index 0000000000000..70246da80a2e4
--- /dev/null
+++ b/templates/group/selector.tmpl
@@ -0,0 +1,27 @@
+{{define "group-selection-item"}}
+
+ {{ctx.AvatarUtils.Avatar . 28 "mini"}}
+ {{.ShortName 40}}
+
+ {{range .Subgroups}}
+ {{block "group-selection-item" .}}
+ {{end}}
+ {{end}}
+{{end}}
+
+
{{ctx.Locale.Tr "group.parent"}}
+
+
+
+
+
+ {{/* block: repo-setting-content */}}
+ {{end}}
+
+
+
+
+ {{template "group/header" .ctxData}}
+
+ {{template "group/settings/navbar" .ctxData}}
+
+ {{template "base/alert" .ctxData}}
+ {{/* block: group-setting-content */}}
+
+ {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+
+
+
+
+
diff --git a/templates/group/settings/options.tmpl b/templates/group/settings/options.tmpl
new file mode 100644
index 0000000000000..8cd3c4afbe1be
--- /dev/null
+++ b/templates/group/settings/options.tmpl
@@ -0,0 +1,56 @@
+{{template "group/settings/layout_head" (dict "ctxData" . "pageClass" "repo-group settings options")}}
+
+
+{{template "group/settings/layout_footer" .}}
diff --git a/templates/group/sidebar/menu.tmpl b/templates/group/sidebar/menu.tmpl
new file mode 100644
index 0000000000000..f25375b799741
--- /dev/null
+++ b/templates/group/sidebar/menu.tmpl
@@ -0,0 +1,18 @@
+
+
diff --git a/templates/group/sidebar/sidebar_item.tmpl b/templates/group/sidebar/sidebar_item.tmpl
new file mode 100644
index 0000000000000..a75016a3f857f
--- /dev/null
+++ b/templates/group/sidebar/sidebar_item.tmpl
@@ -0,0 +1,25 @@
+{{$item := (call (index $.root "AsGroupItem") .item)}}
+{{$parent := $item.Parent}}
+
+
+ {{$active := (and $item.IsGroup (call $.root.GroupIsCurrent $item.ID))}}
+ {{$childContains := (call $.root.GroupHasChild $item)}}
+
+ {{$item.Title}}
+
+
+
+
+
+ {{- range $i, $childItem := $item.Children $.root.Doer -}}
+ {{- template "group/sidebar/sidebar_item" dict "item" $childItem "root" $.root -}}
+ {{- end -}}
+
+
+
diff --git a/templates/group/team/new.tmpl b/templates/group/team/new.tmpl
new file mode 100644
index 0000000000000..ea4beeadc4c16
--- /dev/null
+++ b/templates/group/team/new.tmpl
@@ -0,0 +1,144 @@
+{{template "base/head" .}}
+
+ {{template "group/header" .}}
+
+
+
+
+
{{ctx.Locale.Tr "group.teams.delete_team_desc"}}
+
+ {{template "base/modal_actions_confirm" .}}
+
+ {{template "group/header" .}}
+
+ {{template "base/alert" .}}
+
+
+
+
+ {{if or .IsGroupAdmin .IsGroupOwner}}
+
+
+ {{end}}
+ {{range .Teams}}
+
+
+
+ {{range .Members}}
+ {{template "shared/user/avatarlink" dict "user" .}}
+ {{end}}
+
+
+
+ {{end}}
+
+
+
+ {{template "group/sidebar/menu" .}}
+
+
+
+
+
+
+
{{ctx.Locale.Tr "org.teams.leave.detail" (`
+
+ {{template "base/modal_actions_confirm" .}}
+
+
+
+
{{ctx.Locale.Tr "group.teams.remove.detail" (`
+
+ {{template "base/modal_actions_confirm" .}}
+
{{if .ProfileReadmeContent}}
-
{{.ProfileReadmeContent}}
+
{{.ProfileReadmeContent}}
{{end}}
{{template "shared/repo/search" .}}
{{template "shared/repo/list" .}}
@@ -16,15 +17,21 @@
{{if .ShowMemberAndTeamTab}}
{{if .CanCreateOrgRepo}}
-
-
+
+
{{end}}
-
+
+
+ {{template "group/sidebar/menu" .}}
+
+
{{if and .ShowMemberAndTeamTab .ShowOrgProfileReadmeSelector}}
@@ -47,43 +54,50 @@
{{end}}
{{if .NumMembers}}
-
-
- {{$isMember := .IsOrganizationMember}}
- {{range .Members}}
- {{if or $isMember (call $.IsPublicMember .ID)}}
-
{{ctx.AvatarUtils.Avatar . 48}}
- {{end}}
- {{end}}
-
+
+
+ {{$isMember := .IsOrganizationMember}}
+ {{range .Members}}
+ {{if or $isMember (call $.IsPublicMember .ID)}}
+
{{ctx.AvatarUtils.Avatar . 48}}
+ {{end}}
+ {{end}}
+
{{end}}
{{if .IsOrganizationMember}}
-
-
- {{range .Teams}}
-
- {{end}}
+
+
+ {{range .Teams}}
+
- {{if .IsOrganizationOwner}}
-
{{end}}
+
+ {{if .IsOrganizationOwner}}
+
+ {{end}}
{{end}}
-
{{end}}
+
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index cdd2789128dfa..21deb08a08fcb 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -1,6 +1,10 @@
{{template "base/head" .}}
+ {{if .PageIsOrgTeams}}
{{template "org/header" .}}
+ {{else if .PageIsGroupTeams}}
+ {{template "group/header" .}}
+ {{end}}
{{end}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index ada7e0c0920d6..4fa99130f97b9 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -43,6 +43,16 @@
{{ctx.Locale.Tr "repo.repo_name_profile_public_hint"}}
{{ctx.Locale.Tr "repo.repo_name_profile_private_hint"}}
+
{{ctx.Locale.Tr "repo.group"}}
+
+
+
{{ctx.Locale.Tr "repo.visibility"}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index b61076ff4637e..2a61d14385f21 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -8,7 +8,12 @@
-
{{.Owner.Name}} /
{{.Name}}
+
{{.Owner.Name}}
+ {{- range $.Breadcrumbs -}}
+ /
{{.Name}}
+ {{- end -}}
+ /
{{.Name}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 749d86901de93..b4a60870c6c56 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -1279,6 +1279,256 @@
}
}
},
+ "/groups/{group_id}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "gets a group in an organization",
+ "operationId": "groupGet",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "id of the group to retrieve",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/Group"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ },
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repositoryGroup"
+ ],
+ "summary": "Delete a repository group",
+ "operationId": "groupDelete",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "id of the group to delete",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "204": {
+ "$ref": "#/responses/empty"
+ },
+ "403": {
+ "$ref": "#/responses/forbidden"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ },
+ "patch": {
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "edits a group in an organization. only fields that are set will be changed.",
+ "operationId": "groupEdit",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "id of the group to edit",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ },
+ {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/EditGroupOption"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/Group"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ },
+ "422": {
+ "$ref": "#/responses/validationError"
+ }
+ }
+ }
+ },
+ "/groups/{group_id}/move": {
+ "post": {
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "move a group to a different parent group",
+ "operationId": "groupMove",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "id of the group to move",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ },
+ {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/MoveGroupOption"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/Group"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ },
+ "422": {
+ "$ref": "#/responses/validationError"
+ }
+ }
+ }
+ },
+ "/groups/{group_id}/new": {
+ "post": {
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "create a subgroup inside a group",
+ "operationId": "groupNewSubGroup",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "id of the group to create a subgroup in",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ },
+ {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/NewGroupOption"
+ }
+ }
+ ],
+ "responses": {
+ "201": {
+ "$ref": "#/responses/Group"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ },
+ "422": {
+ "$ref": "#/responses/validationError"
+ }
+ }
+ }
+ },
+ "/groups/{group_id}/repos": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "gets the repos contained within a group",
+ "operationId": "groupGetRepos",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "id of the group containing the repositories",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/RepositoryList"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
+ "/groups/{group_id}/subgroups": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "gets the subgroups contained within a group",
+ "operationId": "groupGetSubGroups",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "id of the parent group",
+ "name": "group_id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/GroupList"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
"/label/templates": {
"get": {
"produces": [
@@ -2806,6 +3056,49 @@
}
}
},
+ "/orgs/{org}/groups/new": {
+ "post": {
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository-group"
+ ],
+ "summary": "create a root-level repository group for an organization",
+ "operationId": "groupNew",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "name of the organization",
+ "name": "org",
+ "in": "path",
+ "required": true
+ },
+ {
+ "name": "body",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/NewGroupOption"
+ }
+ }
+ ],
+ "responses": {
+ "201": {
+ "$ref": "#/responses/Group"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ },
+ "422": {
+ "$ref": "#/responses/validationError"
+ }
+ }
+ }
+ },
"/orgs/{org}/hooks": {
"get": {
"produces": [
@@ -23313,6 +23606,12 @@
"type": "string",
"x-go-name": "Gitignores"
},
+ "group_id": {
+ "description": "GroupID of the group which will contain this repository. ignored if the repo owner is not an organization.",
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "GroupID"
+ },
"issue_labels": {
"description": "Label-Set to use",
"type": "string",
@@ -23950,6 +24249,26 @@
},
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
+ "EditGroupOption": {
+ "description": "EditGroupOption represents options for editing a repository group",
+ "type": "object",
+ "properties": {
+ "description": {
+ "description": "the new description of the group",
+ "type": "string",
+ "x-go-name": "Description"
+ },
+ "name": {
+ "description": "the new name of the group",
+ "type": "string",
+ "x-go-name": "Name"
+ },
+ "visibility": {
+ "$ref": "#/definitions/VisibleType"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
"EditHookOption": {
"description": "EditHookOption options when modify one hook",
"type": "object",
@@ -25215,6 +25534,57 @@
},
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
+ "Group": {
+ "description": "Group represents a group of repositories and subgroups in an organization",
+ "type": "object",
+ "properties": {
+ "avatar_url": {
+ "type": "string",
+ "x-go-name": "AvatarURL"
+ },
+ "description": {
+ "type": "string",
+ "x-go-name": "Description"
+ },
+ "id": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "ID"
+ },
+ "link": {
+ "type": "string",
+ "x-go-name": "Link"
+ },
+ "name": {
+ "type": "string",
+ "x-go-name": "Name"
+ },
+ "num_repos": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "NumRepos"
+ },
+ "num_subgroups": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "NumSubgroups"
+ },
+ "owner": {
+ "$ref": "#/definitions/User"
+ },
+ "parentGroupID": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "ParentGroupID"
+ },
+ "sort_order": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "SortOrder"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
"Hook": {
"description": "Hook a hook is a web hook when one repository changed",
"type": "object",
@@ -26019,6 +26389,51 @@
},
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
+ "MoveGroupOption": {
+ "description": "MoveGroupOption represents options for changing a group or repo's parent and sort order",
+ "type": "object",
+ "required": [
+ "newParent"
+ ],
+ "properties": {
+ "newParent": {
+ "description": "the new parent group. can be 0 to specify no parent",
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "NewParent"
+ },
+ "newPos": {
+ "description": "the position of this group in its new parent",
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "NewPos"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
+ "NewGroupOption": {
+ "description": "NewGroupOption represents options for creating a new group in an organization",
+ "type": "object",
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "description": {
+ "description": "the description of the newly created group",
+ "type": "string",
+ "x-go-name": "Description"
+ },
+ "name": {
+ "description": "the name for the newly created group",
+ "type": "string",
+ "x-go-name": "Name"
+ },
+ "visibility": {
+ "$ref": "#/definitions/VisibleType"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
"NewIssuePinsAllowed": {
"description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed",
"type": "object",
@@ -27376,6 +27791,16 @@
"type": "string",
"x-go-name": "FullName"
},
+ "group_id": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "GroupID"
+ },
+ "group_sort_order": {
+ "type": "integer",
+ "format": "int64",
+ "x-go-name": "GroupSortOrder"
+ },
"has_actions": {
"type": "boolean",
"x-go-name": "HasActions"
@@ -28455,6 +28880,12 @@
},
"x-go-package": "code.gitea.io/gitea/modules/structs"
},
+ "VisibleType": {
+ "description": "VisibleType defines the visibility of user and org",
+ "type": "integer",
+ "format": "int64",
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
"WatchInfo": {
"description": "WatchInfo represents an API watch status of one repository",
"type": "object",
@@ -28987,6 +29418,21 @@
}
}
},
+ "Group": {
+ "description": "Group",
+ "schema": {
+ "$ref": "#/definitions/Group"
+ }
+ },
+ "GroupList": {
+ "description": "GroupList",
+ "schema": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/Group"
+ }
+ }
+ },
"Hook": {
"description": "Hook",
"schema": {
@@ -29692,7 +30138,7 @@
"parameterBodies": {
"description": "parameterBodies",
"schema": {
- "$ref": "#/definitions/LockIssueOption"
+ "$ref": "#/definitions/MoveGroupOption"
}
},
"redirect": {
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 7eb845833fec4..53ae80ffbcab1 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -74,25 +74,34 @@
+
+ {{template "group/dashboard/menu" .}}
+
{{end}}
{{if .ContextUser.IsOrganization}}
+ {{$suffix := ""}}
+ {{if .Team}}
+ {{$suffix = PathEscape .Team.Name}}
+ {{else if .Group}}
+ {{$suffix = URLJoin "group" (StringUtils.ToString .Group.ID)}}
+ {{end}}