fine tune "view as"

Author: wxiaoguang

routers/web/org/home.go

@@ -116,13 +116,12 @@ func home(ctx *context.Context, viewRepositories bool) {
 	}
 
 	// if no profile readme, it still means "view repositories"
-	ctx.Data["PageIsViewRepositories"] = viewRepositories || !prepareOrgProfileReadme(ctx, prepareResult)
+	isViewOverview := !viewRepositories && prepareOrgProfileReadme(ctx, prepareResult)
+	ctx.Data["PageIsViewRepositories"] = !isViewOverview
+	ctx.Data["PageIsViewOverview"] = isViewOverview
+	ctx.Data["ShowOrgProfileReadmeSelector"] = isViewOverview && prepareResult.ProfilePublicReadmeBlob != nil && prepareResult.ProfilePrivateReadmeBlob != nil
 
-	var (
-		repos []*repo_model.Repository
-		count int64
-	)
-	repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
+	repos, count, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
 		ListOptions: db.ListOptions{
 			PageSize: setting.UI.User.RepoPagingNum,
 			Page:     page,
@@ -156,7 +155,7 @@ func home(ctx *context.Context, viewRepositories bool) {
 }
 
 func prepareOrgProfileReadme(ctx *context.Context, prepareResult *shared_user.PrepareOrgHeaderResult) bool {
-	viewAs := ctx.FormString("view_as")
+	viewAs := ctx.FormString("view_as", util.Iif(ctx.Org.IsMember, "member", "public"))
 	viewAsMember := viewAs == "member"
 
 	var profileRepo *repo_model.Repository

routers/web/shared/user/header.go

@@ -202,6 +202,5 @@ func PrepareOrgHeader(ctx *context.Context) (result *PrepareOrgHeaderResult, err
 	result.ProfilePrivateRepo, result.ProfilePrivateReadmeBlob = FindOwnerProfileReadme(ctx, ctx.Doer, RepoNameProfilePrivate)
 	result.HasOrgProfileReadme = result.ProfilePublicReadmeBlob != nil || result.ProfilePrivateReadmeBlob != nil
 	ctx.Data["HasOrgProfileReadme"] = result.HasOrgProfileReadme // many pages need it to show the "overview" tab
-	ctx.Data["ShowOrgProfileReadmeSelector"] = result.ProfilePublicReadmeBlob != nil && result.ProfilePrivateReadmeBlob != nil
 	return result, nil
 }

services/context/base_form.go

@@ -8,11 +8,16 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/optional"
+	"code.gitea.io/gitea/modules/util"
 )
 
 // FormString returns the first value matching the provided key in the form as a string
-func (b *Base) FormString(key string) string {
-	return b.Req.FormValue(key)
+func (b *Base) FormString(key string, def ...string) string {
+	s := b.Req.FormValue(key)
+	if s == "" {
+		s = util.OptionalArg(def)
+	}
+	return s
 }
 
 // FormStrings returns a string slice for the provided key from the form

templates/org/home.tmpl

@@ -33,10 +33,10 @@
 						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						<div class="menu">
 							{{/* TODO: does it really need to use CurrentURL with query parameters? Why not construct a new link with clear parameters */}}
-							<a href="{{QueryBuild $.CurrentURL "view_as" "public"}}" class="item {{if not .IsViewingOrgAsMember}}selected{{end}}">
+							<a href="?view_as=public" class="item {{if not .IsViewingOrgAsMember}}selected{{end}}">
 								{{svg "octicon-check" 14 (Iif (not .IsViewingOrgAsMember) "" "tw-invisible")}} {{ctx.Locale.Tr "settings.visibility.public"}}
 							</a>
-							<a href="{{QueryBuild $.CurrentURL "view_as" "member"}}" class="item {{if .IsViewingOrgAsMember}}selected{{end}}">
+							<a href="?view_as=member" class="item {{if .IsViewingOrgAsMember}}selected{{end}}">
 								{{svg "octicon-check" 14 (Iif .IsViewingOrgAsMember "" "tw-invisible")}}  {{ctx.Locale.Tr "org.members.member"}}
 							</a>
 						</div>

tests/integration/org_profile_test.go

@@ -82,10 +82,10 @@ func testOrgProfile(t *testing.T, u *url.URL) {
 
 	// Site Admin
 	session = loginUser(t, "user1")
-	req = NewRequest(t, "GET", "org3")
+	req = NewRequest(t, "GET", "/org3")
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	bodyString = util.UnsafeBytesToString(resp.Body.Bytes())
-	assert.Contains(t, bodyString, contentPublicReadme)
+	assert.Contains(t, bodyString, contentPrivateReadme) // as an org member, default to show the private profile
 	assert.Contains(t, bodyString, `id="org-home-view-as-dropdown"`)
 
 	req = NewRequest(t, "GET", "/org3?view_as=member")