From 97808157603a0c332cfd2a660d1cc77ffd9f1483 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Tue, 15 Aug 2023 01:54:42 +0000
Subject: [PATCH 1/2] fix

---
 modules/context/org.go     | 1 +
 routers/web/org/home.go    | 1 -
 routers/web/org/members.go | 1 -
 routers/web/org/setting.go | 1 -
 routers/web/org/teams.go   | 1 -
 5 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/context/org.go b/modules/context/org.go
index 835c761372fa9..76af029489120 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -236,6 +236,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 			return
 		}
 	}
+	ctx.Data["ContextUser"] = ctx.ContextUser
 
 	ctx.Data["CanReadProjects"] = ctx.Org.CanReadUnit(ctx, unit.TypeProjects)
 	ctx.Data["CanReadPackages"] = ctx.Org.CanReadUnit(ctx, unit.TypePackages)
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 7f38ec51ba6e2..8ec41a9564e12 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -162,7 +162,6 @@ func Home(ctx *context.Context) {
 	pager.SetDefaultParams(ctx)
 	pager.AddParam(ctx, "language", "Language")
 	ctx.Data["Page"] = pager
-	ctx.Data["ContextUser"] = ctx.ContextUser
 
 	ctx.HTML(http.StatusOK, tplOrgHome)
 }
diff --git a/routers/web/org/members.go b/routers/web/org/members.go
index fae8b48128be8..3c073211aee92 100644
--- a/routers/web/org/members.go
+++ b/routers/web/org/members.go
@@ -62,7 +62,6 @@ func Members(ctx *context.Context) {
 	}
 	ctx.Data["Page"] = pager
 	ctx.Data["Members"] = members
-	ctx.Data["ContextUser"] = ctx.ContextUser
 	ctx.Data["MembersIsPublicMember"] = membersIsPublic
 	ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(members, org.ID)
 	ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus()
diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index 5ae61c79befe2..b3ac379335afe 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -45,7 +45,6 @@ func Settings(ctx *context.Context) {
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
 	ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
-	ctx.Data["ContextUser"] = ctx.ContextUser
 	ctx.HTML(http.StatusOK, tplSettingsOptions)
 }
 
diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index 196d3e9bf0403..ce55832b6c594 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -56,7 +56,6 @@ func Teams(ctx *context.Context) {
 		}
 	}
 	ctx.Data["Teams"] = ctx.Org.Teams
-	ctx.Data["ContextUser"] = ctx.ContextUser
 
 	ctx.HTML(http.StatusOK, tplTeams)
 }

From 283ce602e9d6e2801d91318024f9844169398168 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Fri, 18 Aug 2023 06:46:39 +0000
Subject: [PATCH 2/2] add ContextUser to user and repo assignment

---
 modules/context/repo.go           | 1 +
 routers/web/repo/packages.go      | 1 -
 routers/web/shared/user/header.go | 1 -
 routers/web/user/code.go          | 1 -
 services/context/user.go          | 1 +
 5 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index f5c56cf833234..8a16d311b1406 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -471,6 +471,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 	}
 	ctx.Repo.Owner = owner
 	ctx.ContextUser = owner
+	ctx.Data["ContextUser"] = ctx.ContextUser
 	ctx.Data["Username"] = ctx.Repo.Owner.Name
 
 	// redirect link to wiki
diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go
index 6ad2f71b5c2de..ac9e64d774e3f 100644
--- a/routers/web/repo/packages.go
+++ b/routers/web/repo/packages.go
@@ -58,7 +58,6 @@ func Packages(ctx *context.Context) {
 
 	ctx.Data["Title"] = ctx.Tr("packages.title")
 	ctx.Data["IsPackagesPage"] = true
-	ctx.Data["ContextUser"] = ctx.ContextUser
 	ctx.Data["Query"] = query
 	ctx.Data["PackageType"] = packageType
 	ctx.Data["AvailableTypes"] = packages.TypeList
diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go
index 0ef93815a3320..c1be92f48abd4 100644
--- a/routers/web/shared/user/header.go
+++ b/routers/web/shared/user/header.go
@@ -21,7 +21,6 @@ import (
 func prepareContextForCommonProfile(ctx *context.Context) {
 	ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
-	ctx.Data["ContextUser"] = ctx.ContextUser
 	ctx.Data["EnableFeed"] = setting.Other.EnableFeed
 	ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink()
 }
diff --git a/routers/web/user/code.go b/routers/web/user/code.go
index 033f65c9c06c2..29b8b91c89ecd 100644
--- a/routers/web/user/code.go
+++ b/routers/web/user/code.go
@@ -30,7 +30,6 @@ func CodeSearch(ctx *context.Context) {
 	ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
 	ctx.Data["Title"] = ctx.Tr("explore.code")
-	ctx.Data["ContextUser"] = ctx.ContextUser
 
 	language := ctx.FormTrim("l")
 	keyword := ctx.FormTrim("q")
diff --git a/services/context/user.go b/services/context/user.go
index 62d2dc0aa2347..81c2746819e2d 100644
--- a/services/context/user.go
+++ b/services/context/user.go
@@ -27,6 +27,7 @@ func UserAssignmentWeb() func(ctx *context.Context) {
 			}
 		}
 		ctx.ContextUser = userAssignment(ctx.Base, ctx.Doer, errorFn)
+		ctx.Data["ContextUser"] = ctx.ContextUser
 	}
 }