Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow access to the Public Organization Member lists with minimal permissions #20330

Merged
merged 11 commits into from
Jul 15, 2022
Merged

Allow access to the Public Organization Member lists with minimal permissions #20330

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cdff2f0
not request login for view public org members
a1012112796 Jul 12, 2022
d880a25
Merge branch 'main' into fix-ui-public-org
6543 Jul 12, 2022
4444bc1
Merge branch 'main' into fix-ui-public-org
a1012112796 Jul 13, 2022
0bd9cb3
Merge branch 'main' into fix-ui-public-org
wxiaoguang Jul 13, 2022
ab95622
Merge branch 'main' into fix-ui-public-org
wxiaoguang Jul 13, 2022
be0c1f9
Merge branch 'main' into fix-ui-public-org
a1012112796 Jul 14, 2022
3cc3ce9
fix permisson check
a1012112796 Jul 14, 2022
0c08884
Merge branch 'main' into fix-ui-public-org
wxiaoguang Jul 14, 2022
b75f7f1
Merge branch 'main' into fix-ui-public-org
wxiaoguang Jul 15, 2022
974721a
Merge branch 'main' into fix-ui-public-org
zeripath Jul 15, 2022
068061e
Merge branch 'main' into fix-ui-public-org
zeripath Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion routers/web/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,12 @@ func RegisterRoutes(m *web.Route) {
}

// ***** START: Organization *****
m.Group("/org", func() {
m.Group("/{org}", func() {
m.Get("/members", org.Members)
}, context.OrgAssignment())
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
}, ignSignIn)

m.Group("/org", func() {
m.Group("", func() {
m.Get("/create", org.Create)
Expand All @@ -625,7 +631,6 @@ func RegisterRoutes(m *web.Route) {
m.Get("/pulls/{team}", user.Pulls)
m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones)
m.Get("/milestones/{team}", reqMilestonesDashboardPageEnabled, user.Milestones)
m.Get("/members", org.Members)
m.Post("/members/action/{action}", org.MembersAction)
m.Get("/teams", org.Teams)
}, context.OrgAssignment(true, false, true))
Expand Down
8 changes: 3 additions & 5 deletions templates/org/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@
{{end}}
<h4 class="ui top attached header df">
<strong class="f1">{{.locale.Tr "org.people"}}</strong>
{{if .IsOrganizationMember}}
<div class="ui">
<a class="text grey dif ac" href="{{.OrgLink}}/members"><span>{{.Org.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
</div>
{{end}}
<div class="ui">
<a class="text grey dif ac" href="{{.OrgLink}}/members"><span>{{.MembersTotal}}</span> {{svg "octicon-chevron-right"}}</a>
</div>
</h4>
<div class="ui attached segment members">
{{$isMember := .IsOrganizationMember}}
Expand Down