Skip to content

Commit 54593db

Browse files
author
Ben Chang
committed
make sure the drop down appears only when criteria are met
1 parent 35b45fb commit 54593db

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

routers/web/org/home.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package org
55

66
import (
77
"fmt"
8+
html_template "html/template"
89
"net/http"
910
"path"
1011
"strings"
11-
html_template "html/template"
1212

1313
"code.gitea.io/gitea/models/db"
1414
"code.gitea.io/gitea/models/organization"
@@ -131,6 +131,12 @@ func home(ctx *context.Context, viewRepositories bool) {
131131
ctx.Data["PageIsViewRepositories"] = true
132132
}
133133

134+
err = shared_user.RenderOrgHeader(ctx)
135+
if err != nil {
136+
ctx.ServerError("RenderOrgHeader", err)
137+
return
138+
}
139+
134140
var (
135141
repos []*repo_model.Repository
136142
count int64

templates/org/home.tmpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
<div class="ui container">
66
<div class="ui mobile reversed stackable grid">
77
<div class="ui {{if .ShowMemberAndTeamTab}}eleven wide{{end}} column">
8+
{{if and .ShowMemberAndTeamTab .HasPublicProfileReadme .HasPrivateProfileReadme}}
89
<div class="item ui small dropdown jump">
9-
<span class="text">view as</span>
10+
<span class="text">view as: {{if not .IsViewerMember}}Public{{else}}Member{{end}}</span>
1011
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
1112
<div class="menu">
1213
<a href="{{$.Org.HomeLink}}?{{.QueryForPublic}}" class="{{if not .IsViewerMember}}active {{end}}item"><input hidden type="radio" {{if not .IsViewerMember}}checked{{end}}> Public</a>
1314
<a href="{{$.Org.HomeLink}}?{{.QueryForMember}}" class="{{if .IsViewerMember}}active {{end}}item"><input hidden type="radio" {{if .IsViewerMember}}checked{{end}}> Member</a>
1415
</div>
1516
</div>
17+
{{end}}
1618
{{if .IsViewerMember}}
17-
{{if .PrivateProfileReadme}}
19+
{{if and .ShowMemberAndTeamTab .PrivateProfileReadme}}
1820
<div id="readme_profile" class="markup">{{.PrivateProfileReadme}}</div>
1921
{{end}}
2022
{{else}}

0 commit comments

Comments
 (0)