templates/org/home.tmpl: fix org member can't see public repo
This commit is contained in:
Unknwon
parent
a6a99d49cf
commit
c753fdceaf
3 changed files with 72 additions and 72 deletions
2
gogs.go
2
gogs.go
|
|
@ -17,7 +17,7 @@ import (
|
||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.5.14.0221 Beta"
|
const APP_VER = "0.5.14.0222 Beta"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
0.5.14.0221 Beta
|
0.5.14.0222 Beta
|
||||||
|
|
@ -9,85 +9,85 @@
|
||||||
{{if .IsOrganizationOwner}}<a class="text-grey" href="{{.OrgLink}}/settings"><span class="octicon octicon-gear"></span></a>{{end}}
|
{{if .IsOrganizationOwner}}<a class="text-grey" href="{{.OrgLink}}/settings"><span class="octicon octicon-gear"></span></a>{{end}}
|
||||||
</h2>
|
</h2>
|
||||||
{{if .Org.Description}}<p>{{.Org.Description}}</p>{{end}}
|
{{if .Org.Description}}<p>{{.Org.Description}}</p>{{end}}
|
||||||
<ul class="text-grey">
|
<ul class="text-grey">
|
||||||
{{if .Org.Location}}<li><span class="octicon octicon-location"></span> <span>{{.Org.Location}}</span></li>{{end}}
|
{{if .Org.Location}}<li><span class="octicon octicon-location"></span> <span>{{.Org.Location}}</span></li>{{end}}
|
||||||
{{if .Org.Website}}<li><span class="octicon octicon-link"></span> <a target="_blank" href="{{.Org.Website}}">{{.Org.Website}}</a></li>{{end}}
|
{{if .Org.Website}}<li><span class="octicon octicon-link"></span> <a target="_blank" href="{{.Org.Website}}">{{.Org.Website}}</a></li>{{end}}
|
||||||
{{if .Org.Email}}<li><span class="octicon octicon-mail"></span> <a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></li>{{end}}
|
{{if .Org.Email}}<li><span class="octicon octicon-mail"></span> <a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></li>{{end}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{{$isMember := .Org.IsOrgMember $.SignedUser.Id}}
|
{{$isMember := .Org.IsOrgMember $.SignedUser.Id}}
|
||||||
<div id="org-home-repo-list" class="left grid-2-3">
|
<div id="org-home-repo-list" class="left grid-2-3">
|
||||||
<div class="clear">
|
<div class="clear">
|
||||||
{{if .IsOrganizationOwner}}
|
{{if .IsOrganizationOwner}}
|
||||||
<a class="btn btn-green btn-large btn-link btn-radius right" href="{{AppSubUrl}}/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a>
|
<a class="btn btn-green btn-large btn-link btn-radius right" href="{{AppSubUrl}}/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div id="org-repo-list">
|
<div id="org-repo-list">
|
||||||
{{range .Repos}}
|
{{range .Repos}}
|
||||||
{{if .HasAccess $.SignedUser.Name}}
|
{{if or (not .IsPrivate) (.HasAccess $.SignedUser.Name)}}
|
||||||
<div class="org-repo-item">
|
<div class="org-repo-item">
|
||||||
<ul class="org-repo-status right">
|
<ul class="org-repo-status right">
|
||||||
<li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
|
<li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
|
||||||
<li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
|
<li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2><a href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2>
|
<h2><a href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2>
|
||||||
<p class="org-repo-description">{{.Description}}</p>
|
<p class="org-repo-description">{{.Description}}</p>
|
||||||
<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
|
<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="grid-1-3 right">
|
</div>
|
||||||
<div class="org-sidebar">
|
<div class="grid-1-3 right">
|
||||||
<div class="panel panel-radius">
|
<div class="org-sidebar">
|
||||||
<div class="panel-header">
|
<div class="panel panel-radius">
|
||||||
{{if $isMember}}
|
<div class="panel-header">
|
||||||
<a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
|
{{if $isMember}}
|
||||||
{{end}}
|
<a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
|
||||||
<strong>{{.i18n.Tr "org.people"}}</strong>
|
{{end}}
|
||||||
</div>
|
<strong>{{.i18n.Tr "org.people"}}</strong>
|
||||||
<div class="panel-body member-avatar-group">
|
</div>
|
||||||
{{range .Members}}
|
<div class="panel-body member-avatar-group">
|
||||||
|
{{range .Members}}
|
||||||
{{if or $isMember (.IsPublicMember $.Org.Id)}}
|
{{if or $isMember (.IsPublicMember $.Org.Id)}}
|
||||||
<a href="{{AppSubUrl}}/{{.Name}}" title="{{.Name}}"><img src="{{.AvatarLink}}"></a>
|
<a href="{{AppSubUrl}}/{{.Name}}" title="{{.Name}}"><img src="{{.AvatarLink}}"></a>
|
||||||
{{end}}
|
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
{{end}}
|
||||||
{{if .IsOrganizationOwner}}
|
</div>
|
||||||
<div class="panel-footer">
|
{{if .IsOrganizationOwner}}
|
||||||
<a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
|
<div class="panel-footer">
|
||||||
</div>
|
<a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
|
||||||
{{end}}
|
</div>
|
||||||
</div>
|
{{end}}
|
||||||
{{if $isMember}}
|
|
||||||
<br>
|
|
||||||
<div class="panel panel-radius">
|
|
||||||
<div class="panel-header">
|
|
||||||
<a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
|
|
||||||
<strong>{{.i18n.Tr "org.teams"}}</strong>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body" id="org-home-team-list">
|
|
||||||
<ul>
|
|
||||||
{{range .Teams}}
|
|
||||||
<li>
|
|
||||||
<a class="text-black" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
|
|
||||||
<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
|
|
||||||
</li>
|
|
||||||
{{end}}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{{if .IsOrganizationOwner}}
|
|
||||||
<div class="panel-footer">
|
|
||||||
<a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{{if $isMember}}
|
||||||
|
<br>
|
||||||
|
<div class="panel panel-radius">
|
||||||
|
<div class="panel-header">
|
||||||
|
<a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
|
||||||
|
<strong>{{.i18n.Tr "org.teams"}}</strong>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body" id="org-home-team-list">
|
||||||
|
<ul>
|
||||||
|
{{range .Teams}}
|
||||||
|
<li>
|
||||||
|
<a class="text-black" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
|
||||||
|
<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
|
||||||
|
</li>
|
||||||
|
{{end}}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
{{if .IsOrganizationOwner}}
|
||||||
|
<div class="panel-footer">
|
||||||
|
<a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{template "ng/base/footer" .}}
|
{{template "ng/base/footer" .}}
|
||||||
Loading…
Add table
Reference in a new issue