Skip to content

Commit 11a5510

Browse files
ExplodingDragonExplodingDragon
committed
cleanup
1 parent 679181b commit 11a5510

File tree

6 files changed

+41
-56
lines changed

6 files changed

+41
-56
lines changed

‎routers/web/org/home.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,22 @@ 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-
if err = shared_user.LoadHeaderCount(ctx); err != nil {
107-
ctx.ServerError("LoadHeaderCount", err)
108-
return
109-
}
110106
prepareResult, err := shared_user.PrepareOrgHeader(ctx)
111107
if err != nil {
112108
ctx.ServerError("PrepareOrgHeader", err)
113109
return
114110
}
115-
116111
// if no profile readme, it still means "view repositories"
117112
isViewOverview := !viewRepositories && prepareOrgProfileReadme(ctx, prepareResult)
118113
ctx.Data["PageIsViewRepositories"] = !isViewOverview
119114
ctx.Data["PageIsViewOverview"] = isViewOverview
120115
ctx.Data["ShowOrgProfileReadmeSelector"] = isViewOverview && prepareResult.ProfilePublicReadmeBlob != nil && prepareResult.ProfilePrivateReadmeBlob != nil
121116

117+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
118+
ctx.ServerError("RenderUserOrgHeader", err)
119+
return
120+
}
121+
122122
repos, count, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
123123
ListOptions: db.ListOptions{
124124
PageSize: setting.UI.User.RepoPagingNum,

‎routers/web/org/projects.go‎

Lines changed: 4 additions & 5 deletions
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,10 +104,6 @@ func Projects(ctx *context.Context) {
101104
}
102105

103106
ctx.Data["Projects"] = projects
104-
if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
105-
ctx.ServerError("RenderUserOrgHeader", err)
106-
return
107-
}
108107

109108
if isShowClosed {
110109
ctx.Data["State"] = "closed"

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package user
55

66
import (
7+
"errors"
78
"net/url"
89

910
"code.gitea.io/gitea/models/db"
@@ -33,10 +34,8 @@ func prepareContextForCommonProfile(ctx *context.Context) {
3334
ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink()
3435
}
3536

36-
// PrepareContextForProfileBigAvatar set the context for big avatar view on the profile page
37-
func PrepareContextForProfileBigAvatar(ctx *context.Context) {
38-
prepareContextForCommonProfile(ctx)
39-
37+
// prepareContextForProfileBigAvatar set the context for big avatar view on the profile page
38+
func prepareContextForProfileBigAvatar(ctx *context.Context) {
4039
ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx, ctx.Doer.ID, ctx.ContextUser.ID)
4140
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate
4241
if setting.Service.UserLocationMapURL != "" {
@@ -145,18 +144,23 @@ func RenderUserOrgHeader(ctx *context.Context) error {
145144
_, profileReadmeBlob := FindOwnerProfileReadme(ctx, ctx.Doer)
146145
ctx.Data["HasUserProfileReadme"] = profileReadmeBlob != nil
147146

148-
if ctx.ContextUser != nil && ctx.ContextUser.IsOrganization() {
149-
_, err := PrepareOrgHeader(ctx)
150-
if err != nil {
151-
return err
147+
if ctx.ContextUser == nil {
148+
return errors.New("ctx.ContextUser is nil")
149+
}
150+
if ctx.ContextUser.IsOrganization() {
151+
if ctx.Data["HasOrgProfileReadme"] == nil {
152+
if _, err := PrepareOrgHeader(ctx); err != nil {
153+
return err
154+
}
152155
}
156+
} else {
157+
prepareContextForProfileBigAvatar(ctx)
153158
}
154159
return nil
155160
}
156161

157162
func LoadHeaderCount(ctx *context.Context) error {
158163
prepareContextForCommonProfile(ctx)
159-
160164
repoCount, err := repo_model.CountRepository(ctx, &repo_model.SearchRepoOptions{
161165
Actor: ctx.Doer,
162166
OwnerID: ctx.ContextUser.ID,

‎routers/web/user/code.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ func CodeSearch(ctx *context.Context) {
2626
ctx.Redirect(ctx.ContextUser.HomeLink())
2727
return
2828
}
29-
shared_user.PrepareContextForProfileBigAvatar(ctx)
3029
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
3130
ctx.ServerError("RenderUserOrgHeader", err)
3231
return

‎routers/web/user/package.go‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ const (
4242

4343
// ListPackages displays a list of all packages of the context user
4444
func ListPackages(ctx *context.Context) {
45-
shared_user.PrepareContextForProfileBigAvatar(ctx)
45+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
46+
ctx.ServerError("RenderUserOrgHeader", err)
47+
return
48+
}
4649
page := ctx.FormInt("page")
4750
if page <= 1 {
4851
page = 1
@@ -94,11 +97,6 @@ func ListPackages(ctx *context.Context) {
9497
return
9598
}
9699

97-
if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
98-
ctx.ServerError("RenderUserOrgHeader", err)
99-
return
100-
}
101-
102100
ctx.Data["Title"] = ctx.Tr("packages.title")
103101
ctx.Data["IsPackagesPage"] = true
104102
ctx.Data["Query"] = query
@@ -169,14 +167,12 @@ func RedirectToLastVersion(ctx *context.Context) {
169167

170168
// ViewPackageVersion displays a single package version
171169
func ViewPackageVersion(ctx *context.Context) {
172-
shared_user.PrepareContextForProfileBigAvatar(ctx)
173-
pd := ctx.Package.Descriptor
174-
175170
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
176171
ctx.ServerError("RenderUserOrgHeader", err)
177172
return
178173
}
179174

175+
pd := ctx.Package.Descriptor
180176
ctx.Data["Title"] = pd.Package.Name
181177
ctx.Data["IsPackagesPage"] = true
182178
ctx.Data["PackageDescriptor"] = pd
@@ -304,18 +300,16 @@ func ViewPackageVersion(ctx *context.Context) {
304300
hasRepositoryAccess = permission.HasAnyUnitAccess()
305301
}
306302
ctx.Data["HasRepositoryAccess"] = hasRepositoryAccess
307-
308-
err = shared_user.LoadHeaderCount(ctx)
309-
if err != nil {
310-
ctx.ServerError("LoadHeaderCount", err)
311-
return
312-
}
313303
ctx.HTML(http.StatusOK, tplPackagesView)
314304
}
315305

316306
// ListPackageVersions lists all versions of a package
317307
func ListPackageVersions(ctx *context.Context) {
318-
shared_user.PrepareContextForProfileBigAvatar(ctx)
308+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
309+
ctx.ServerError("RenderUserOrgHeader", err)
310+
return
311+
}
312+
319313
p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.Type(ctx.PathParam("type")), ctx.PathParam("name"))
320314
if err != nil {
321315
if err == packages_model.ErrPackageNotExist {
@@ -338,11 +332,6 @@ func ListPackageVersions(ctx *context.Context) {
338332
query := ctx.FormTrim("q")
339333
sort := ctx.FormTrim("sort")
340334

341-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
342-
ctx.ServerError("RenderUserOrgHeader", err)
343-
return
344-
}
345-
346335
ctx.Data["Title"] = ctx.Tr("packages.title")
347336
ctx.Data["IsPackagesPage"] = true
348337
ctx.Data["PackageDescriptor"] = &packages_model.PackageDescriptor{
@@ -398,12 +387,6 @@ func ListPackageVersions(ctx *context.Context) {
398387

399388
ctx.Data["Total"] = total
400389

401-
err = shared_user.LoadHeaderCount(ctx)
402-
if err != nil {
403-
ctx.ServerError("LoadHeaderCount", err)
404-
return
405-
}
406-
407390
pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5)
408391
pager.AddParamFromRequest(ctx.Req)
409392
ctx.Data["Page"] = pager
@@ -431,11 +414,6 @@ func PackageSettings(ctx *context.Context) {
431414
ctx.Data["Repos"] = repos
432415
ctx.Data["CanWritePackages"] = ctx.Package.AccessMode >= perm.AccessModeWrite || ctx.IsUserSiteAdmin()
433416

434-
err := shared_user.LoadHeaderCount(ctx)
435-
if err != nil {
436-
ctx.ServerError("LoadHeaderCount", err)
437-
return
438-
}
439417
ctx.HTML(http.StatusOK, tplPackagesSettings)
440418
}
441419

‎routers/web/user/profile.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@ func userProfile(ctx *context.Context) {
7878

7979
showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID)
8080
prepareUserProfileTabData(ctx, showPrivate, profileDbRepo, profileReadmeBlob)
81-
// call PrepareContextForProfileBigAvatar later to avoid re-querying the NumFollowers & NumFollowing
82-
shared_user.PrepareContextForProfileBigAvatar(ctx)
81+
// call prepareContextForProfileBigAvatar later to avoid re-querying the NumFollowers & NumFollowing
82+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
83+
ctx.ServerError("RenderUserOrgHeader", err)
84+
return
85+
}
8386
ctx.HTML(http.StatusOK, tplProfile)
8487
}
8588

@@ -327,9 +330,11 @@ func ActionUserFollow(ctx *context.Context) {
327330
ctx.HTTPError(http.StatusBadRequest, fmt.Sprintf("Action %q failed", ctx.FormString("action")))
328331
return
329332
}
330-
333+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
334+
ctx.ServerError("RenderUserOrgHeader", err)
335+
return
336+
}
331337
if ctx.ContextUser.IsIndividual() {
332-
shared_user.PrepareContextForProfileBigAvatar(ctx)
333338
ctx.HTML(http.StatusOK, tplProfileBigAvatar)
334339
return
335340
} else if ctx.ContextUser.IsOrganization() {

0 commit comments

Comments
 (0)