Skip to content

Commit fe850b5

Browse files
add group-scoped dashboard pages for issues, pull requests and milestones
1 parent 80b72ec commit fe850b5

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

routers/web/user/home.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func Dashboard(ctx *context.Context) {
110110
}
111111

112112
if setting.Service.EnableUserHeatmap {
113-
data, err := activities_model.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.Doer)
113+
data, err := activities_model.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.RepoGroup.Group, ctx.Doer)
114114
if err != nil {
115115
ctx.ServerError("GetUserHeatmapDataByUserTeam", err)
116116
return
@@ -122,6 +122,7 @@ func Dashboard(ctx *context.Context) {
122122
feeds, count, err := feed_service.GetFeedsForDashboard(ctx, activities_model.GetFeedsOptions{
123123
RequestedUser: ctxUser,
124124
RequestedTeam: ctx.Org.Team,
125+
RequestedGroup: ctx.RepoGroup.Group,
125126
Actor: ctx.Doer,
126127
IncludePrivate: true,
127128
OnlyPerformedBy: false,
@@ -170,6 +171,9 @@ func Milestones(ctx *context.Context) {
170171
Archived: optional.Some(false),
171172
HasMilestones: optional.Some(true), // Just needs display repos has milestones
172173
}
174+
if ctx.RepoGroup.Group != nil {
175+
repoOpts.GroupID = ctx.RepoGroup.Group.ID
176+
}
173177

174178
if ctxUser.IsOrganization() && ctx.Org.Team != nil {
175179
repoOpts.TeamID = ctx.Org.Team.ID
@@ -474,6 +478,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
474478
if opts.Team != nil {
475479
repoOpts.TeamID = opts.Team.ID
476480
}
481+
if ctx.RepoGroup.Group != nil {
482+
repoOpts.GroupID = ctx.RepoGroup.Group.ID
483+
}
477484
accessibleRepos := container.Set[int64]{}
478485
{
479486
ids, _, err := repo_model.SearchRepositoryIDs(ctx, repoOpts)

routers/web/web.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,12 +897,16 @@ func registerWebRoutes(m *web.Router) {
897897
m.Group("/{org}", func() {
898898
m.Get("/dashboard", user.Dashboard)
899899
m.Get("/dashboard/{team}", user.Dashboard)
900+
m.Get("/dashboard/group/{group_id}", ctxDataSet("PageIsGroupDashboard", true), context.GroupAssignment(context.GroupAssignmentOptions{RequireMember: true}), user.Dashboard)
900901
m.Get("/issues", user.Issues)
901902
m.Get("/issues/{team}", user.Issues)
903+
m.Get("/issues/group/{group_id}", context.GroupAssignment(context.GroupAssignmentOptions{RequireMember: true}), user.Issues)
902904
m.Get("/pulls", user.Pulls)
903905
m.Get("/pulls/{team}", user.Pulls)
906+
m.Get("/pulls/group/{group_id}", context.GroupAssignment(context.GroupAssignmentOptions{RequireMember: true}), user.Pulls)
904907
m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones)
905908
m.Get("/milestones/{team}", reqMilestonesDashboardPageEnabled, user.Milestones)
909+
m.Get("/milestones/group/{group_id}", reqMilestonesDashboardPageEnabled, user.Milestones)
906910
m.Post("/members/action/{action}", org.MembersAction)
907911
m.Get("/teams", org.Teams)
908912

0 commit comments

Comments
 (0)