Skip to content

Commit 35b45fb

Browse files
author
Ben Chang
committed
make query string right
1 parent 2969180 commit 35b45fb

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

routers/web/org/home.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"net/http"
99
"path"
1010
"strings"
11+
html_template "html/template"
1112

1213
"code.gitea.io/gitea/models/db"
1314
"code.gitea.io/gitea/models/organization"
@@ -112,11 +113,11 @@ func home(ctx *context.Context, viewRepositories bool) {
112113
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
113114

114115
currentURL := ctx.Req.URL
115-
queryParams := currentURL.Query()
116+
queryParams := currentURL.Query()
116117
queryParams.Set("view_as", "member")
117-
ctx.Data["QueryForMember"] = queryParams.Encode()
118+
ctx.Data["QueryForMember"] = html_template.URL(queryParams.Encode())
118119
queryParams.Set("view_as", "public")
119-
ctx.Data["QueryForPublic"] = queryParams.Encode()
120+
ctx.Data["QueryForPublic"] = html_template.URL(queryParams.Encode())
120121

121122
isViewerMember := ctx.FormString("view_as") == "member"
122123
ctx.Data["IsViewerMember"] = isViewerMember

templates/org/home.tmpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<div class="ui container">
66
<div class="ui mobile reversed stackable grid">
77
<div class="ui {{if .ShowMemberAndTeamTab}}eleven wide{{end}} column">
8+
<div class="item ui small dropdown jump">
9+
<span class="text">view as</span>
10+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
11+
<div class="menu">
12+
<a href="{{$.Org.HomeLink}}?{{.QueryForPublic}}" class="{{if not .IsViewerMember}}active {{end}}item"><input hidden type="radio" {{if not .IsViewerMember}}checked{{end}}> Public</a>
13+
<a href="{{$.Org.HomeLink}}?{{.QueryForMember}}" class="{{if .IsViewerMember}}active {{end}}item"><input hidden type="radio" {{if .IsViewerMember}}checked{{end}}> Member</a>
14+
</div>
15+
</div>
816
{{if .IsViewerMember}}
917
{{if .PrivateProfileReadme}}
1018
<div id="readme_profile" class="markup">{{.PrivateProfileReadme}}</div>

0 commit comments

Comments
 (0)