Skip to content

Commit 2d9c4d7

Browse files
ExplodingDragonExplodingDragon
committed
refactor v2: LoadHeaderCount
1 parent 543683c commit 2d9c4d7

File tree

14 files changed

+40
-109
lines changed

14 files changed

+40
-109
lines changed

‎routers/web/org/home.go‎

Lines changed: 0 additions & 6 deletions
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,

‎routers/web/org/projects.go‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@ func Projects(ctx *context.Context) {
116116
project.RenderedContent = renderUtils.MarkdownToHtml(project.Description)
117117
}
118118

119-
err = shared_user.LoadHeaderCount(ctx)
120-
if err != nil {
121-
ctx.ServerError("LoadHeaderCount", err)
122-
return
123-
}
124-
125119
numPages := 0
126120
if total > 0 {
127121
numPages = (int(total) - 1/setting.UI.IssuePagingNum)
@@ -160,12 +154,6 @@ func RenderNewProject(ctx *context.Context) {
160154
return
161155
}
162156

163-
err := shared_user.LoadHeaderCount(ctx)
164-
if err != nil {
165-
ctx.ServerError("LoadHeaderCount", err)
166-
return
167-
}
168-
169157
ctx.HTML(http.StatusOK, tplProjectsNew)
170158
}
171159

@@ -299,12 +287,6 @@ func EditProjectPost(ctx *context.Context) {
299287
return
300288
}
301289

302-
err := shared_user.LoadHeaderCount(ctx)
303-
if err != nil {
304-
ctx.ServerError("LoadHeaderCount", err)
305-
return
306-
}
307-
308290
if ctx.HasError() {
309291
ctx.HTML(http.StatusOK, tplProjectsNew)
310292
return
@@ -464,12 +446,6 @@ func ViewProject(ctx *context.Context) {
464446
return
465447
}
466448

467-
err = shared_user.LoadHeaderCount(ctx)
468-
if err != nil {
469-
ctx.ServerError("LoadHeaderCount", err)
470-
return
471-
}
472-
473449
ctx.HTML(http.StatusOK, tplProjectsView)
474450
}
475451

‎routers/web/org/setting.go‎

Lines changed: 8 additions & 12 deletions
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‎

Lines changed: 2 additions & 3 deletions
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‎

Lines changed: 8 additions & 12 deletions
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‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ func NewTeam(ctx *context.Context) {
276276
ctx.Data["PageIsOrgTeamsNew"] = true
277277
ctx.Data["Team"] = &org_model.Team{}
278278
ctx.Data["Units"] = unit_model.Units
279-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
280-
ctx.ServerError("LoadHeaderCount", err)
279+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
280+
ctx.ServerError("RenderUserOrgHeader", err)
281281
return
282282
}
283283
ctx.HTML(http.StatusOK, tplTeamNew)
@@ -373,8 +373,8 @@ func TeamMembers(ctx *context.Context) {
373373
ctx.Data["PageIsOrgTeams"] = true
374374
ctx.Data["PageIsOrgTeamMembers"] = true
375375

376-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
377-
ctx.ServerError("LoadHeaderCount", err)
376+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
377+
ctx.ServerError("RenderUserOrgHeader", err)
378378
return
379379
}
380380

@@ -401,8 +401,8 @@ func TeamRepositories(ctx *context.Context) {
401401
ctx.Data["PageIsOrgTeams"] = true
402402
ctx.Data["PageIsOrgTeamRepos"] = true
403403

404-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
405-
ctx.ServerError("LoadHeaderCount", err)
404+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
405+
ctx.ServerError("RenderUserOrgHeader", err)
406406
return
407407
}
408408

@@ -468,8 +468,8 @@ func EditTeam(ctx *context.Context) {
468468
ctx.ServerError("LoadUnits", err)
469469
return
470470
}
471-
if err := shared_user.LoadHeaderCount(ctx); err != nil {
472-
ctx.ServerError("LoadHeaderCount", err)
471+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
472+
ctx.ServerError("RenderUserOrgHeader", err)
473473
return
474474
}
475475
ctx.Data["Team"] = ctx.Org.Team

‎routers/web/repo/setting/secrets.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) {
4444
}
4545

4646
if ctx.Data["PageIsOrgSettings"] == true {
47-
err := shared_user.LoadHeaderCount(ctx)
48-
if err != nil {
49-
ctx.ServerError("LoadHeaderCount", err)
47+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
48+
ctx.ServerError("RenderUserOrgHeader", err)
5049
return nil, nil
5150
}
5251
return &secretsCtx{

‎routers/web/shared/actions/runners.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) {
5757
}
5858

5959
if ctx.Data["PageIsOrgSettings"] == true {
60-
err := shared_user.LoadHeaderCount(ctx)
61-
if err != nil {
62-
ctx.ServerError("LoadHeaderCount", err)
60+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
61+
ctx.ServerError("RenderUserOrgHeader", err)
6362
return nil, nil
6463
}
6564
return &runnersCtx{

‎routers/web/shared/actions/variables.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ func getVariablesCtx(ctx *context.Context) (*variablesCtx, error) {
4949
}
5050

5151
if ctx.Data["PageIsOrgSettings"] == true {
52-
err := shared_user.LoadHeaderCount(ctx)
53-
if err != nil {
54-
ctx.ServerError("LoadHeaderCount", err)
52+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
53+
ctx.ServerError("RenderUserOrgHeader", err)
5554
return nil, nil
5655
}
5756
return &variablesCtx{

‎routers/web/shared/user/header.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,13 @@ func FindOwnerProfileReadme(ctx *context.Context, doer *user_model.User, optProf
139139
}
140140

141141
func RenderUserOrgHeader(ctx *context.Context) error {
142-
prepareContextForCommonProfile(ctx)
142+
if err := LoadHeaderCount(ctx); err != nil {
143+
return err
144+
}
143145
_, profileReadmeBlob := FindOwnerProfileReadme(ctx, ctx.Doer)
144146
ctx.Data["HasUserProfileReadme"] = profileReadmeBlob != nil
145147

146-
if ctx.ContextUser.IsOrganization() {
148+
if ctx.ContextUser != nil && ctx.ContextUser.IsOrganization() {
147149
_, err := PrepareOrgHeader(ctx)
148150
if err != nil {
149151
return err

0 commit comments

Comments
 (0)