Browse Source

Do only show teams access for organization repositories, not for personal repositories (#8265)

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
tags/v1.21.12.1
David Svantesson Lunny Xiao 6 years ago
parent
commit
730065a3dc
2 changed files with 3 additions and 0 deletions
  1. +1
    -0
      modules/context/repo.go
  2. +2
    -0
      templates/repo/settings/collaboration.tmpl

+ 1
- 0
modules/context/repo.go View File

@@ -395,6 +395,7 @@ func RepoAssignment() macaron.Handler {
ctx.Data["Owner"] = ctx.Repo.Repository.Owner ctx.Data["Owner"] = ctx.Repo.Repository.Owner
ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner() ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner()
ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin() ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin()
ctx.Data["RepoOwnerIsOrganization"] = repo.Owner.IsOrganization()
ctx.Data["CanWriteCode"] = ctx.Repo.CanWrite(models.UnitTypeCode) ctx.Data["CanWriteCode"] = ctx.Repo.CanWrite(models.UnitTypeCode)
ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(models.UnitTypeIssues) ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(models.UnitTypeIssues)
ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(models.UnitTypePullRequests) ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(models.UnitTypePullRequests)


+ 2
- 0
templates/repo/settings/collaboration.tmpl View File

@@ -52,6 +52,7 @@
</form> </form>
</div> </div>


{{if .RepoOwnerIsOrganization}}
<h4 class="ui top attached header"> <h4 class="ui top attached header">
Teams Teams
</h4> </h4>
@@ -108,6 +109,7 @@
</div> </div>
{{end}} {{end}}
</div> </div>
{{end}}
</div> </div>
</div> </div>




Loading…
Cancel
Save