Ignore view_as param when the profiles not both exist

changchaishi · changchaishi · commit 4347353d3e32 · 2024-12-23T09:35:34.000Z
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
@@ -124,6 +124,7 @@ func home(ctx *context.Context, viewRepositories bool) {
 		ctx.ServerError("RenderOrgHeader", err)
 		return
 	}
+	isBothProfilesExist := ctx.Data["HasPublicProfileReadme"] == true && ctx.Data["HasPrivateProfileReadme"] == true
 
 	isViewerMember := ctx.FormString("view_as")
 	ctx.Data["IsViewerMember"] = isViewerMember == "member"
@@ -133,7 +134,7 @@ func home(ctx *context.Context, viewRepositories bool) {
 		profileType = "Private"
 	}
 
-	if isViewerMember == "" {
+	if !isBothProfilesExist {
 		if !prepareOrgProfileReadme(ctx, viewRepositories, "Public") {
 			if !prepareOrgProfileReadme(ctx, viewRepositories, "Private") {
 				ctx.Data["PageIsViewRepositories"] = true

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ func home(ctx *context.Context, viewRepositories bool) {`
`124`	`124`	`ctx.ServerError("RenderOrgHeader", err)`
`125`	`125`	`return`
`126`	`126`	`}`
	`127`	`+ isBothProfilesExist := ctx.Data["HasPublicProfileReadme"] == true && ctx.Data["HasPrivateProfileReadme"] == true`
`127`	`128`
`128`	`129`	`isViewerMember := ctx.FormString("view_as")`
`129`	`130`	`ctx.Data["IsViewerMember"] = isViewerMember == "member"`
`@@ -133,7 +134,7 @@ func home(ctx *context.Context, viewRepositories bool) {`
`133`	`134`	`profileType = "Private"`
`134`	`135`	`}`
`135`	`136`
`136`		`- if isViewerMember == "" {`
	`137`	`+ if !isBothProfilesExist {`
`137`	`138`	`if !prepareOrgProfileReadme(ctx, viewRepositories, "Public") {`
`138`	`139`	`if !prepareOrgProfileReadme(ctx, viewRepositories, "Private") {`
`139`	`140`	`ctx.Data["PageIsViewRepositories"] = true`