Skip to content

Commit 4ddf94d

Browse files
ExplodingDragonwxiaoguang
ExplodingDragon
and
wxiaoguang
authored
refactor organization menu (#33928)
Fix missing items in organization menu. **Menu** <details> <summary>Show</summary> Before: ![](https://github.com/user-attachments/assets/bcbce97e-84de-44ea-9889-a664979433cd) After: ![](https://github.com/user-attachments/assets/a169e00f-5212-4733-af9e-e8676ad74376) </details> **Packages** <details> keep it consistent with the other pages. <summary>Show</summary> Before: ![](https://github.com/user-attachments/assets/170d7b3d-ecac-49b9-8296-44d0b0f2b191) After: ![](https://github.com/user-attachments/assets/9c3c6915-870c-48cc-8a35-3d615a27d36d) </details> --------- Co-authored-by: wxiaoguang <[email protected]>
1 parent fa49cd7 commit 4ddf94d

File tree

21 files changed

+304
-302
lines changed

21 files changed

+304
-302
lines changed

‎routers/web/org/block.go

+10
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ func BlockedUsers(ctx *context.Context) {
2020
ctx.Data["PageIsOrgSettings"] = true
2121
ctx.Data["PageIsSettingsBlockedUsers"] = true
2222

23+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
24+
ctx.ServerError("RenderUserOrgHeader", err)
25+
return
26+
}
27+
2328
shared_user.BlockedUsers(ctx, ctx.ContextUser)
2429
if ctx.Written() {
2530
return
@@ -29,6 +34,11 @@ func BlockedUsers(ctx *context.Context) {
2934
}
3035

3136
func BlockedUsersPost(ctx *context.Context) {
37+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
38+
ctx.ServerError("RenderUserOrgHeader", err)
39+
return
40+
}
41+
3242
shared_user.BlockedUsersPost(ctx, ctx.ContextUser)
3343
if ctx.Written() {
3444
return

‎routers/web/org/home.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ func home(ctx *context.Context, viewRepositories bool) {
8686
private := ctx.FormOptionalBool("private")
8787
ctx.Data["IsPrivate"] = private
8888

89-
err := shared_user.LoadHeaderCount(ctx)
90-
if err != nil {
91-
ctx.ServerError("LoadHeaderCount", err)
92-
return
93-
}
94-
9589
opts := &organization.FindOrgMembersOpts{
9690
Doer: ctx.Doer,
9791
OrgID: org.ID,
@@ -109,9 +103,9 @@ func home(ctx *context.Context, viewRepositories bool) {
109103
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
110104
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
111105

112-
prepareResult, err := shared_user.PrepareOrgHeader(ctx)
106+
prepareResult, err := shared_user.RenderUserOrgHeader(ctx)
113107
if err != nil {
114-
ctx.ServerError("PrepareOrgHeader", err)
108+
ctx.ServerError("RenderUserOrgHeader", err)
115109
return
116110
}
117111

@@ -154,7 +148,7 @@ func home(ctx *context.Context, viewRepositories bool) {
154148
ctx.HTML(http.StatusOK, tplOrgHome)
155149
}
156150

157-
func prepareOrgProfileReadme(ctx *context.Context, prepareResult *shared_user.PrepareOrgHeaderResult) bool {
151+
func prepareOrgProfileReadme(ctx *context.Context, prepareResult *shared_user.PrepareOwnerHeaderResult) bool {
158152
viewAs := ctx.FormString("view_as", util.Iif(ctx.Org.IsMember, "member", "public"))
159153
viewAsMember := viewAs == "member"
160154

‎routers/web/org/members.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ func Members(ctx *context.Context) {
5454
return
5555
}
5656

57-
_, err = shared_user.PrepareOrgHeader(ctx)
58-
if err != nil {
59-
ctx.ServerError("PrepareOrgHeader", err)
57+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
58+
ctx.ServerError("RenderUserOrgHeader", err)
6059
return
6160
}
6261

‎routers/web/org/projects.go

+18-24
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ func MustEnableProjects(ctx *context.Context) {
4343

4444
// Projects renders the home page of projects
4545
func Projects(ctx *context.Context) {
46-
shared_user.PrepareContextForProfileBigAvatar(ctx)
46+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
47+
ctx.ServerError("RenderUserOrgHeader", err)
48+
return
49+
}
4750
ctx.Data["Title"] = ctx.Tr("repo.projects")
4851

4952
sortType := ctx.FormTrim("sort")
@@ -101,7 +104,6 @@ func Projects(ctx *context.Context) {
101104
}
102105

103106
ctx.Data["Projects"] = projects
104-
shared_user.RenderUserHeader(ctx)
105107

106108
if isShowClosed {
107109
ctx.Data["State"] = "closed"
@@ -113,12 +115,6 @@ func Projects(ctx *context.Context) {
113115
project.RenderedContent = renderUtils.MarkdownToHtml(project.Description)
114116
}
115117

116-
err = shared_user.LoadHeaderCount(ctx)
117-
if err != nil {
118-
ctx.ServerError("LoadHeaderCount", err)
119-
return
120-
}
121-
122118
numPages := 0
123119
if total > 0 {
124120
numPages = (int(total) - 1/setting.UI.IssuePagingNum)
@@ -152,11 +148,8 @@ func RenderNewProject(ctx *context.Context) {
152148
ctx.Data["PageIsViewProjects"] = true
153149
ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink()
154150
ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects"
155-
shared_user.RenderUserHeader(ctx)
156-
157-
err := shared_user.LoadHeaderCount(ctx)
158-
if err != nil {
159-
ctx.ServerError("LoadHeaderCount", err)
151+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
152+
ctx.ServerError("RenderUserOrgHeader", err)
160153
return
161154
}
162155

@@ -167,7 +160,10 @@ func RenderNewProject(ctx *context.Context) {
167160
func NewProjectPost(ctx *context.Context) {
168161
form := web.GetForm(ctx).(*forms.CreateProjectForm)
169162
ctx.Data["Title"] = ctx.Tr("repo.projects.new")
170-
shared_user.RenderUserHeader(ctx)
163+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
164+
ctx.ServerError("RenderUserOrgHeader", err)
165+
return
166+
}
171167

172168
if ctx.HasError() {
173169
RenderNewProject(ctx)
@@ -248,7 +244,10 @@ func RenderEditProject(ctx *context.Context) {
248244
ctx.Data["CanWriteProjects"] = canWriteProjects(ctx)
249245
ctx.Data["CardTypes"] = project_model.GetCardConfig()
250246

251-
shared_user.RenderUserHeader(ctx)
247+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
248+
ctx.ServerError("RenderUserOrgHeader", err)
249+
return
250+
}
252251

253252
p, err := project_model.GetProjectByID(ctx, ctx.PathParamInt64("id"))
254253
if err != nil {
@@ -282,11 +281,8 @@ func EditProjectPost(ctx *context.Context) {
282281
ctx.Data["CardTypes"] = project_model.GetCardConfig()
283282
ctx.Data["CancelLink"] = project_model.ProjectLinkForOrg(ctx.ContextUser, projectID)
284283

285-
shared_user.RenderUserHeader(ctx)
286-
287-
err := shared_user.LoadHeaderCount(ctx)
288-
if err != nil {
289-
ctx.ServerError("LoadHeaderCount", err)
284+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
285+
ctx.ServerError("RenderUserOrgHeader", err)
290286
return
291287
}
292288

@@ -443,11 +439,9 @@ func ViewProject(ctx *context.Context) {
443439
ctx.Data["Project"] = project
444440
ctx.Data["IssuesMap"] = issuesMap
445441
ctx.Data["Columns"] = columns
446-
shared_user.RenderUserHeader(ctx)
447442

448-
err = shared_user.LoadHeaderCount(ctx)
449-
if err != nil {
450-
ctx.ServerError("LoadHeaderCount", err)
443+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
444+
ctx.ServerError("RenderUserOrgHeader", err)
451445
return
452446
}
453447

‎routers/web/org/setting.go

+8-12
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ func Settings(ctx *context.Context) {
4848
ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
4949
ctx.Data["ContextUser"] = ctx.ContextUser
5050

51-
err := shared_user.LoadHeaderCount(ctx)
52-
if err != nil {
53-
ctx.ServerError("LoadHeaderCount", err)
51+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
52+
ctx.ServerError("RenderUserOrgHeader", err)
5453
return
5554
}
5655

@@ -194,9 +193,8 @@ func SettingsDelete(ctx *context.Context) {
194193
return
195194
}
196195

197-
err := shared_user.LoadHeaderCount(ctx)
198-
if err != nil {
199-
ctx.ServerError("LoadHeaderCount", err)
196+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
197+
ctx.ServerError("RenderUserOrgHeader", err)
200198
return
201199
}
202200

@@ -218,9 +216,8 @@ func Webhooks(ctx *context.Context) {
218216
return
219217
}
220218

221-
err = shared_user.LoadHeaderCount(ctx)
222-
if err != nil {
223-
ctx.ServerError("LoadHeaderCount", err)
219+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
220+
ctx.ServerError("RenderUserOrgHeader", err)
224221
return
225222
}
226223

@@ -246,9 +243,8 @@ func Labels(ctx *context.Context) {
246243
ctx.Data["PageIsOrgSettingsLabels"] = true
247244
ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles
248245

249-
err := shared_user.LoadHeaderCount(ctx)
250-
if err != nil {
251-
ctx.ServerError("LoadHeaderCount", err)
246+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
247+
ctx.ServerError("RenderUserOrgHeader", err)
252248
return
253249
}
254250

‎routers/web/org/setting_oauth2.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ func Applications(ctx *context.Context) {
4545
}
4646
ctx.Data["Applications"] = apps
4747

48-
err = shared_user.LoadHeaderCount(ctx)
49-
if err != nil {
50-
ctx.ServerError("LoadHeaderCount", err)
48+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
49+
ctx.ServerError("RenderUserOrgHeader", err)
5150
return
5251
}
5352

‎routers/web/org/setting_packages.go

+8-12
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ func Packages(ctx *context.Context) {
2525
ctx.Data["PageIsOrgSettings"] = true
2626
ctx.Data["PageIsSettingsPackages"] = true
2727

28-
err := shared_user.LoadHeaderCount(ctx)
29-
if err != nil {
30-
ctx.ServerError("LoadHeaderCount", err)
28+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
29+
ctx.ServerError("RenderUserOrgHeader", err)
3130
return
3231
}
3332

@@ -41,9 +40,8 @@ func PackagesRuleAdd(ctx *context.Context) {
4140
ctx.Data["PageIsOrgSettings"] = true
4241
ctx.Data["PageIsSettingsPackages"] = true
4342

44-
err := shared_user.LoadHeaderCount(ctx)
45-
if err != nil {
46-
ctx.ServerError("LoadHeaderCount", err)
43+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
44+
ctx.ServerError("RenderUserOrgHeader", err)
4745
return
4846
}
4947

@@ -57,9 +55,8 @@ func PackagesRuleEdit(ctx *context.Context) {
5755
ctx.Data["PageIsOrgSettings"] = true
5856
ctx.Data["PageIsSettingsPackages"] = true
5957

60-
err := shared_user.LoadHeaderCount(ctx)
61-
if err != nil {
62-
ctx.ServerError("LoadHeaderCount", err)
58+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
59+
ctx.ServerError("RenderUserOrgHeader", err)
6360
return
6461
}
6562

@@ -99,9 +96,8 @@ func PackagesRulePreview(ctx *context.Context) {
9996
ctx.Data["PageIsOrgSettings"] = true
10097
ctx.Data["PageIsSettingsPackages"] = true
10198

102-
err := shared_user.LoadHeaderCount(ctx)
103-
if err != nil {
104-
ctx.ServerError("LoadHeaderCount", err)
99+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
100+
ctx.ServerError("RenderUserOrgHeader", err)
105101
return
106102
}
107103

‎routers/web/org/teams.go

+22-24
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ const (
4646

4747
// Teams render teams list page
4848
func Teams(ctx *context.Context) {
49+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
50+
ctx.ServerError("RenderUserOrgHeader", err)
51+
return
52+
}
4953
org := ctx.Org.Organization
5054
ctx.Data["Title"] = org.FullName
5155
ctx.Data["PageIsOrgTeams"] = true
@@ -58,12 +62,6 @@ func Teams(ctx *context.Context) {
5862
}
5963
ctx.Data["Teams"] = ctx.Org.Teams
6064

61-
_, err := shared_user.PrepareOrgHeader(ctx)
62-
if err != nil {
63-
ctx.ServerError("PrepareOrgHeader", err)
64-
return
65-
}
66-
6765
ctx.HTML(http.StatusOK, tplTeams)
6866
}
6967

@@ -272,15 +270,15 @@ func TeamsRepoAction(ctx *context.Context) {
272270

273271
// NewTeam render create new team page
274272
func NewTeam(ctx *context.Context) {
273+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
274+
ctx.ServerError("RenderUserOrgHeader", err)
275+
return
276+
}
275277
ctx.Data["Title"] = ctx.Org.Organization.FullName
276278
ctx.Data["PageIsOrgTeams"] = true
277279
ctx.Data["PageIsOrgTeamsNew"] = true
278280
ctx.Data["Team"] = &org_model.Team{}
279281
ctx.Data["Units"] = unit_model.Units
280-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
281-
ctx.ServerError("LoadHeaderCount", err)
282-
return
283-
}
284282
ctx.HTML(http.StatusOK, tplTeamNew)
285283
}
286284

@@ -370,15 +368,15 @@ func NewTeamPost(ctx *context.Context) {
370368

371369
// TeamMembers render team members page
372370
func TeamMembers(ctx *context.Context) {
371+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
372+
ctx.ServerError("RenderUserOrgHeader", err)
373+
return
374+
}
375+
373376
ctx.Data["Title"] = ctx.Org.Team.Name
374377
ctx.Data["PageIsOrgTeams"] = true
375378
ctx.Data["PageIsOrgTeamMembers"] = true
376379

377-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
378-
ctx.ServerError("LoadHeaderCount", err)
379-
return
380-
}
381-
382380
if err := ctx.Org.Team.LoadMembers(ctx); err != nil {
383381
ctx.ServerError("GetMembers", err)
384382
return
@@ -398,15 +396,15 @@ func TeamMembers(ctx *context.Context) {
398396

399397
// TeamRepositories show the repositories of team
400398
func TeamRepositories(ctx *context.Context) {
399+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
400+
ctx.ServerError("RenderUserOrgHeader", err)
401+
return
402+
}
403+
401404
ctx.Data["Title"] = ctx.Org.Team.Name
402405
ctx.Data["PageIsOrgTeams"] = true
403406
ctx.Data["PageIsOrgTeamRepos"] = true
404407

405-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
406-
ctx.ServerError("LoadHeaderCount", err)
407-
return
408-
}
409-
410408
repos, err := repo_model.GetTeamRepositories(ctx, &repo_model.SearchTeamRepoOptions{
411409
TeamID: ctx.Org.Team.ID,
412410
})
@@ -463,16 +461,16 @@ func SearchTeam(ctx *context.Context) {
463461

464462
// EditTeam render team edit page
465463
func EditTeam(ctx *context.Context) {
464+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
465+
ctx.ServerError("RenderUserOrgHeader", err)
466+
return
467+
}
466468
ctx.Data["Title"] = ctx.Org.Organization.FullName
467469
ctx.Data["PageIsOrgTeams"] = true
468470
if err := ctx.Org.Team.LoadUnits(ctx); err != nil {
469471
ctx.ServerError("LoadUnits", err)
470472
return
471473
}
472-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
473-
ctx.ServerError("LoadHeaderCount", err)
474-
return
475-
}
476474
ctx.Data["Team"] = ctx.Org.Team
477475
ctx.Data["Units"] = unit_model.Units
478476
ctx.HTML(http.StatusOK, tplTeamNew)

0 commit comments

Comments
 (0)