rewrite

Author: ExplodingDragon

routers/web/org/projects.go

@@ -101,7 +101,10 @@ func Projects(ctx *context.Context) {
 	}
 
 	ctx.Data["Projects"] = projects
-	shared_user.RenderUserHeader(ctx)
+	if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
+		ctx.ServerError("RenderUserOrgHeader", err)
+		return
+	}
 
 	if isShowClosed {
 		ctx.Data["State"] = "closed"
@@ -126,13 +129,6 @@ func Projects(ctx *context.Context) {
 
 	pager := context.NewPagination(int(total), setting.UI.IssuePagingNum, page, numPages)
 	pager.AddParamFromRequest(ctx.Req)
-
-	_, err = shared_user.PrepareOrgHeader(ctx)
-	if err != nil {
-		ctx.ServerError("PrepareOrgHeader", err)
-		return
-	}
-
 	ctx.Data["Page"] = pager
 
 	ctx.Data["CanWriteProjects"] = canWriteProjects(ctx)

routers/web/org/worktime.go

@@ -72,9 +72,8 @@ func Worktime(ctx *context.Context) {
 		return
 	}
 
-	_, err = shared_user.PrepareOrgHeader(ctx)
-	if err != nil {
-		ctx.ServerError("PrepareOrgHeader", err)
+	if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
+		ctx.ServerError("RenderUserOrgHeader", err)
 		return
 	}
 

routers/web/shared/user/header.go

@@ -145,6 +145,17 @@ func RenderUserHeader(ctx *context.Context) {
 	ctx.Data["HasUserProfileReadme"] = profileReadmeBlob != nil
 }
 
+func RenderUserOrgHeader(ctx *context.Context) error {
+	RenderUserHeader(ctx)
+	if ctx.ContextUser.IsOrganization() {
+		_, err := PrepareOrgHeader(ctx)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func LoadHeaderCount(ctx *context.Context) error {
 	prepareContextForCommonProfile(ctx)
 

routers/web/user/code.go

@@ -27,19 +27,15 @@ func CodeSearch(ctx *context.Context) {
 		return
 	}
 	shared_user.PrepareContextForProfileBigAvatar(ctx)
-	shared_user.RenderUserHeader(ctx)
+	if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
+		ctx.ServerError("RenderUserOrgHeader", err)
+		return
+	}
 
 	if err := shared_user.LoadHeaderCount(ctx); err != nil {
 		ctx.ServerError("LoadHeaderCount", err)
 		return
 	}
-	if ctx.ContextUser.IsOrganization() {
-		_, err := shared_user.PrepareOrgHeader(ctx)
-		if err != nil {
-			ctx.ServerError("PrepareOrgHeader", err)
-			return
-		}
-	}
 
 	ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
 	ctx.Data["Title"] = ctx.Tr("explore.code")

routers/web/user/package.go

@@ -94,7 +94,10 @@ func ListPackages(ctx *context.Context) {
 		return
 	}
 
-	shared_user.RenderUserHeader(ctx)
+	if err = shared_user.RenderUserOrgHeader(ctx); err != nil {
+		ctx.ServerError("RenderUserOrgHeader", err)
+		return
+	}
 
 	ctx.Data["Title"] = ctx.Tr("packages.title")
 	ctx.Data["IsPackagesPage"] = true
@@ -125,11 +128,6 @@ func ListPackages(ctx *context.Context) {
 			ctx.Data["IsOrganizationMember"] = false
 			ctx.Data["IsOrganizationOwner"] = false
 		}
-		_, err := shared_user.PrepareOrgHeader(ctx)
-		if err != nil {
-			ctx.ServerError("PrepareOrgHeader", err)
-			return
-		}
 	}
 
 	pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5)
@@ -415,7 +413,10 @@ func ListPackageVersions(ctx *context.Context) {
 func PackageSettings(ctx *context.Context) {
 	pd := ctx.Package.Descriptor
 
-	shared_user.RenderUserHeader(ctx)
+	if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
+		ctx.ServerError("RenderUserOrgHeader", err)
+		return
+	}
 
 	ctx.Data["Title"] = pd.Package.Name
 	ctx.Data["IsPackagesPage"] = true
@@ -433,13 +434,6 @@ func PackageSettings(ctx *context.Context) {
 		ctx.ServerError("LoadHeaderCount", err)
 		return
 	}
-	if ctx.ContextUser.IsOrganization() {
-		_, err = shared_user.PrepareOrgHeader(ctx)
-		if err != nil {
-			ctx.ServerError("PrepareOrgHeader", err)
-			return
-		}
-	}
 	ctx.HTML(http.StatusOK, tplPackagesSettings)
 }