Skip to content

Commit 0850be6

Browse files

File tree

10 files changed

+3
-7
lines changed

10 files changed

+3
-7
lines changed

modules/context/org.go

+1
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
250250
return
251251
}
252252
}
253+
ctx.Data["ContextUser"] = ctx.ContextUser
253254

254255
ctx.Data["CanReadProjects"] = ctx.Org.CanReadUnit(ctx, unit.TypeProjects)
255256
ctx.Data["CanReadPackages"] = ctx.Org.CanReadUnit(ctx, unit.TypePackages)

modules/context/repo.go

+1
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
471471
}
472472
ctx.Repo.Owner = owner
473473
ctx.ContextUser = owner
474+
ctx.Data["ContextUser"] = ctx.ContextUser
474475
ctx.Data["Username"] = ctx.Repo.Owner.Name
475476

476477
// redirect link to wiki

routers/web/org/home.go

-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ func Home(ctx *context.Context) {
152152
pager.SetDefaultParams(ctx)
153153
pager.AddParam(ctx, "language", "Language")
154154
ctx.Data["Page"] = pager
155-
ctx.Data["ContextUser"] = ctx.ContextUser
156155

157156
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
158157

routers/web/org/members.go

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func Members(ctx *context.Context) {
6262
}
6363
ctx.Data["Page"] = pager
6464
ctx.Data["Members"] = members
65-
ctx.Data["ContextUser"] = ctx.ContextUser
6665
ctx.Data["MembersIsPublicMember"] = membersIsPublic
6766
ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(members, org.ID)
6867
ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus()

routers/web/org/setting.go

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func Settings(ctx *context.Context) {
4545
ctx.Data["PageIsSettingsOptions"] = true
4646
ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
4747
ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
48-
ctx.Data["ContextUser"] = ctx.ContextUser
4948
ctx.HTML(http.StatusOK, tplSettingsOptions)
5049
}
5150

routers/web/org/teams.go

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ func Teams(ctx *context.Context) {
5656
}
5757
}
5858
ctx.Data["Teams"] = ctx.Org.Teams
59-
ctx.Data["ContextUser"] = ctx.ContextUser
6059

6160
ctx.HTML(http.StatusOK, tplTeams)
6261
}

routers/web/repo/packages.go

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func Packages(ctx *context.Context) {
5858

5959
ctx.Data["Title"] = ctx.Tr("packages.title")
6060
ctx.Data["IsPackagesPage"] = true
61-
ctx.Data["ContextUser"] = ctx.ContextUser
6261
ctx.Data["Query"] = query
6362
ctx.Data["PackageType"] = packageType
6463
ctx.Data["AvailableTypes"] = packages.TypeList

routers/web/shared/user/header.go

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
func prepareContextForCommonProfile(ctx *context.Context) {
2323
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
2424
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
25-
ctx.Data["ContextUser"] = ctx.ContextUser
2625
ctx.Data["EnableFeed"] = setting.Other.EnableFeed
2726
ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink()
2827
}

routers/web/user/code.go

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func CodeSearch(ctx *context.Context) {
3030
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
3131
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
3232
ctx.Data["Title"] = ctx.Tr("explore.code")
33-
ctx.Data["ContextUser"] = ctx.ContextUser
3433

3534
language := ctx.FormTrim("l")
3635
keyword := ctx.FormTrim("q")

services/context/user.go

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func UserAssignmentWeb() func(ctx *context.Context) {
2727
}
2828
}
2929
ctx.ContextUser = userAssignment(ctx.Base, ctx.Doer, errorFn)
30+
ctx.Data["ContextUser"] = ctx.ContextUser
3031
}
3132
}
3233

0 commit comments

Comments
 (0)