Do only show teams access for organization repositories, not for pers…

…onal repositories (#8265) Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
go-gitea · Sep 24, 2019 · 730065a · 730065a
1 parent b6cfca6
commit 730065a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/modules/context/repo.go b/modules/context/repo.go
@@ -395,6 +395,7 @@ func RepoAssignment() macaron.Handler {
 		ctx.Data["Owner"] = ctx.Repo.Repository.Owner
 		ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner()
 		ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin()
+		ctx.Data["RepoOwnerIsOrganization"] = repo.Owner.IsOrganization()
 		ctx.Data["CanWriteCode"] = ctx.Repo.CanWrite(models.UnitTypeCode)
 		ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(models.UnitTypeIssues)
 		ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(models.UnitTypePullRequests)

diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
@@ -52,6 +52,7 @@
 			</form>
 		</div>
 
+		{{if .RepoOwnerIsOrganization}}
 		<h4 class="ui top attached header">
 			Teams
 		</h4>
@@ -108,6 +109,7 @@
 				</div>
 			{{end}}
 		</div>
+		{{end}}
 	</div>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ @@
     			</form>
     		</div>
+    		{{if .RepoOwnerIsOrganization}}
     		<h4 class="ui top attached header">
     			Teams
     		</h4>
@@ Expand Down Expand Up / @@ -108,6 +109,7 @@ @@
     				</div>
     			{{end}}
     		</div>
+    		{{end}}
     	</div>
     </div>
@@ Expand Down @@