Skip to content

Commit 417c7fe

Browse files
wxiaoguangwxiaoguang
committed
refactor
1 parent 3066296 commit 417c7fe

File tree

17 files changed

+66
-80
lines changed

17 files changed

+66
-80
lines changed

‎routers/web/org/block.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ 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 {
23+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
2424
ctx.ServerError("RenderUserOrgHeader", err)
2525
return
2626
}
@@ -34,7 +34,7 @@ func BlockedUsers(ctx *context.Context) {
3434
}
3535

3636
func BlockedUsersPost(ctx *context.Context) {
37-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
37+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
3838
ctx.ServerError("RenderUserOrgHeader", err)
3939
return
4040
}

‎routers/web/org/home.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,18 @@ func home(ctx *context.Context, viewRepositories bool) {
103103
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
104104
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
105105

106-
prepareResult, err := shared_user.PrepareOrgHeader(ctx)
106+
prepareResult, err := shared_user.RenderUserOrgHeader(ctx)
107107
if err != nil {
108-
ctx.ServerError("PrepareOrgHeader", err)
108+
ctx.ServerError("RenderUserOrgHeader", err)
109109
return
110110
}
111+
111112
// if no profile readme, it still means "view repositories"
112113
isViewOverview := !viewRepositories && prepareOrgProfileReadme(ctx, prepareResult)
113114
ctx.Data["PageIsViewRepositories"] = !isViewOverview
114115
ctx.Data["PageIsViewOverview"] = isViewOverview
115116
ctx.Data["ShowOrgProfileReadmeSelector"] = isViewOverview && prepareResult.ProfilePublicReadmeBlob != nil && prepareResult.ProfilePrivateReadmeBlob != nil
116117

117-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
118-
ctx.ServerError("RenderUserOrgHeader", err)
119-
return
120-
}
121-
122118
repos, count, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
123119
ListOptions: db.ListOptions{
124120
PageSize: setting.UI.User.RepoPagingNum,
@@ -152,7 +148,7 @@ func home(ctx *context.Context, viewRepositories bool) {
152148
ctx.HTML(http.StatusOK, tplOrgHome)
153149
}
154150

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

‎routers/web/org/members.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func Members(ctx *context.Context) {
5454
return
5555
}
5656

57-
if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
57+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
5858
ctx.ServerError("RenderUserOrgHeader", err)
5959
return
6060
}

‎routers/web/org/projects.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func MustEnableProjects(ctx *context.Context) {
4343

4444
// Projects renders the home page of projects
4545
func Projects(ctx *context.Context) {
46-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
46+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
4747
ctx.ServerError("RenderUserOrgHeader", err)
4848
return
4949
}
@@ -148,7 +148,7 @@ func RenderNewProject(ctx *context.Context) {
148148
ctx.Data["PageIsViewProjects"] = true
149149
ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink()
150150
ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects"
151-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
151+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
152152
ctx.ServerError("RenderUserOrgHeader", err)
153153
return
154154
}
@@ -160,7 +160,7 @@ func RenderNewProject(ctx *context.Context) {
160160
func NewProjectPost(ctx *context.Context) {
161161
form := web.GetForm(ctx).(*forms.CreateProjectForm)
162162
ctx.Data["Title"] = ctx.Tr("repo.projects.new")
163-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
163+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
164164
ctx.ServerError("RenderUserOrgHeader", err)
165165
return
166166
}
@@ -244,7 +244,7 @@ func RenderEditProject(ctx *context.Context) {
244244
ctx.Data["CanWriteProjects"] = canWriteProjects(ctx)
245245
ctx.Data["CardTypes"] = project_model.GetCardConfig()
246246

247-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
247+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
248248
ctx.ServerError("RenderUserOrgHeader", err)
249249
return
250250
}
@@ -281,7 +281,7 @@ func EditProjectPost(ctx *context.Context) {
281281
ctx.Data["CardTypes"] = project_model.GetCardConfig()
282282
ctx.Data["CancelLink"] = project_model.ProjectLinkForOrg(ctx.ContextUser, projectID)
283283

284-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
284+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
285285
ctx.ServerError("RenderUserOrgHeader", err)
286286
return
287287
}
@@ -440,7 +440,7 @@ func ViewProject(ctx *context.Context) {
440440
ctx.Data["IssuesMap"] = issuesMap
441441
ctx.Data["Columns"] = columns
442442

443-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
443+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
444444
ctx.ServerError("RenderUserOrgHeader", err)
445445
return
446446
}

‎routers/web/org/setting.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func Settings(ctx *context.Context) {
4848
ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
4949
ctx.Data["ContextUser"] = ctx.ContextUser
5050

51-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
51+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
5252
ctx.ServerError("RenderUserOrgHeader", err)
5353
return
5454
}
@@ -193,7 +193,7 @@ func SettingsDelete(ctx *context.Context) {
193193
return
194194
}
195195

196-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
196+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
197197
ctx.ServerError("RenderUserOrgHeader", err)
198198
return
199199
}
@@ -216,7 +216,7 @@ func Webhooks(ctx *context.Context) {
216216
return
217217
}
218218

219-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
219+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
220220
ctx.ServerError("RenderUserOrgHeader", err)
221221
return
222222
}
@@ -243,7 +243,7 @@ func Labels(ctx *context.Context) {
243243
ctx.Data["PageIsOrgSettingsLabels"] = true
244244
ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles
245245

246-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
246+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
247247
ctx.ServerError("RenderUserOrgHeader", err)
248248
return
249249
}

‎routers/web/org/setting_oauth2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func Applications(ctx *context.Context) {
4545
}
4646
ctx.Data["Applications"] = apps
4747

48-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
48+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
4949
ctx.ServerError("RenderUserOrgHeader", err)
5050
return
5151
}

‎routers/web/org/setting_packages.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func Packages(ctx *context.Context) {
2525
ctx.Data["PageIsOrgSettings"] = true
2626
ctx.Data["PageIsSettingsPackages"] = true
2727

28-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
28+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
2929
ctx.ServerError("RenderUserOrgHeader", err)
3030
return
3131
}
@@ -40,7 +40,7 @@ func PackagesRuleAdd(ctx *context.Context) {
4040
ctx.Data["PageIsOrgSettings"] = true
4141
ctx.Data["PageIsSettingsPackages"] = true
4242

43-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
43+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
4444
ctx.ServerError("RenderUserOrgHeader", err)
4545
return
4646
}
@@ -55,7 +55,7 @@ func PackagesRuleEdit(ctx *context.Context) {
5555
ctx.Data["PageIsOrgSettings"] = true
5656
ctx.Data["PageIsSettingsPackages"] = true
5757

58-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
58+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
5959
ctx.ServerError("RenderUserOrgHeader", err)
6060
return
6161
}
@@ -96,7 +96,7 @@ func PackagesRulePreview(ctx *context.Context) {
9696
ctx.Data["PageIsOrgSettings"] = true
9797
ctx.Data["PageIsSettingsPackages"] = true
9898

99-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
99+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
100100
ctx.ServerError("RenderUserOrgHeader", err)
101101
return
102102
}

‎routers/web/org/teams.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const (
4646

4747
// Teams render teams list page
4848
func Teams(ctx *context.Context) {
49-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
49+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
5050
ctx.ServerError("RenderUserOrgHeader", err)
5151
return
5252
}
@@ -270,7 +270,7 @@ func TeamsRepoAction(ctx *context.Context) {
270270

271271
// NewTeam render create new team page
272272
func NewTeam(ctx *context.Context) {
273-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
273+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
274274
ctx.ServerError("RenderUserOrgHeader", err)
275275
return
276276
}
@@ -368,7 +368,7 @@ func NewTeamPost(ctx *context.Context) {
368368

369369
// TeamMembers render team members page
370370
func TeamMembers(ctx *context.Context) {
371-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
371+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
372372
ctx.ServerError("RenderUserOrgHeader", err)
373373
return
374374
}
@@ -396,7 +396,7 @@ func TeamMembers(ctx *context.Context) {
396396

397397
// TeamRepositories show the repositories of team
398398
func TeamRepositories(ctx *context.Context) {
399-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
399+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
400400
ctx.ServerError("RenderUserOrgHeader", err)
401401
return
402402
}
@@ -461,7 +461,7 @@ func SearchTeam(ctx *context.Context) {
461461

462462
// EditTeam render team edit page
463463
func EditTeam(ctx *context.Context) {
464-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
464+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
465465
ctx.ServerError("RenderUserOrgHeader", err)
466466
return
467467
}

‎routers/web/org/worktime.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func Worktime(ctx *context.Context) {
7272
return
7373
}
7474

75-
if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
75+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
7676
ctx.ServerError("RenderUserOrgHeader", err)
7777
return
7878
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) {
4444
}
4545

4646
if ctx.Data["PageIsOrgSettings"] == true {
47-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
47+
if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil {
4848
ctx.ServerError("RenderUserOrgHeader", err)
4949
return nil, nil
5050
}

0 commit comments

Comments
 (0)