Add teams to repo on collaboration page.

models/repo_collaboration.go

@@ -183,3 +183,29 @@ func (repo *Repository) DeleteCollaboration(uid int64) (err error) {
 
 	return sess.Commit()
 }
+
+func (repo *Repository) getRepoTeams(e Engine) (teams []*Team, err error) {
+	return teams, e.
+		Join("INNER", "team_repo", "team_repo.team_id = team.id").
+		Where("team.org_id = ?", repo.OwnerID).
+		And("team_repo.repo_id=?", repo.ID).
+		OrderBy("CASE WHEN name LIKE '" + ownerTeamName + "' THEN '' ELSE name END").
+		Find(&teams)
+}
+
+func (repo *Repository) GetRepoTeams() ([]*Team, error) {
+	return repo.getRepoTeams(x)
+}
+
+func (t *Team) ModeI18nKey() string {
+	switch t.Authorize {
+	case AccessModeRead:
+		return "repo.settings.collaboration.read"
+	case AccessModeWrite:
+		return "repo.settings.collaboration.write"
+	case AccessModeAdmin:
+		return "repo.settings.collaboration.admin"
+	default:
+		return "repo.settings.collaboration.undefined"
+	}
+}

public/css/index.css

@@ -728,6 +728,8 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .repository.settings.collaboration .collaborator.list>.item:not(:last-child){border-bottom:1px solid #ddd}
 .repository.settings.collaboration #repo-collab-form #search-user-box .results{left:7px}
 .repository.settings.collaboration #repo-collab-form .ui.button{margin-left:5px;margin-top:-3px}
+.repository.settings.collaboration #repo-collab-team-form #search-team-box .results{left:7px}
+.repository.settings.collaboration #repo-collab-team-form .ui.button{margin-left:5px;margin-top:-3px}
 .repository.settings.branches .protected-branches .selection.dropdown{width:300px}
 .repository.settings.branches .protected-branches .item{border:1px solid #eaeaea;padding:10px 15px}
 .repository.settings.branches .protected-branches .item:not(:last-child){border-bottom:0}
@@ -764,6 +766,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .user-cards .list .item .meta{margin-top:5px}
 #search-repo-box .results .result .image,#search-user-box .results .result .image{float:left;margin-right:8px;width:2em;height:2em}
 #search-repo-box .results .result .content,#search-user-box .results .result .content{margin:6px 0}
+#search-team-box .results .result .content{margin:6px 0}
 #issue-filters.hide{display:none}
 #issue-actions{margin-top:-1rem!important}
 #issue-actions.hide{display:none}

public/js/index.js

@@ -1759,6 +1759,30 @@ function searchUsers() {
     });
 }
 
+function searchTeams() {
+    const $searchTeamBox = $('#search-team-box');
+    $searchTeamBox.search({
+        minCharacters: 2,
+        apiSettings: {
+            url: suburl + '/api/v1/orgs/' + $searchTeamBox.data('org') + '/teams',  /* Need new API to search a query */
+            headers: {"X-Csrf-Token": csrf},
+            onResponse: function(response) {
+                const items = [];
+                $.each(response, function (_i, item) {
+                    const title = item.name + ' (' + item.permission + ' access)';
+                    items.push({
+                        title: title,
+                    })
+                });
+
+                return { results: items }
+            }
+        },
+        searchFields: ['name', 'description'],
+        showNoResults: false
+    });
+}
+
 function searchRepositories() {
     const $searchRepoBox = $('#search-repo-box');
     $searchRepoBox.search({
@@ -2169,6 +2193,7 @@ $(document).ready(function () {
 
     buttonsClickOnEnter();
     searchUsers();
+    searchTeams();
     searchRepositories();
 
     initCommentForm();

public/less/_repository.less

@@ -1698,6 +1698,19 @@
                     margin-top: -3px;
                 }
             }
+
+            #repo-collab-team-form {
+                #search-team-box {
+                    .results {
+                        left: 7px;
+                    }
+                }
+
+                .ui.button {
+                    margin-left: 5px;
+                    margin-top: -3px;
+                }
+            }
         }
 
         &.branches {
@@ -1898,6 +1911,16 @@
     }
 }
 
+#search-team-box {
+    .results {
+        .result {
+            .content {
+                margin: 6px 0;
+            }
+        }
+    }
+}
+
 #issue-filters.hide {
     display: none;
 }

routers/repo/setting.go

@@ -490,6 +490,14 @@ func Collaboration(ctx *context.Context) {
 	}
 	ctx.Data["Collaborators"] = users
 
+	teams, err := ctx.Repo.Repository.GetRepoTeams()
+	if err != nil {
+		ctx.ServerError("GetRepoTeams", err)
+		return
+	}
+	ctx.Data["Teams"] = teams
+	ctx.Data["Org"] = ctx.Repo.Repository.OwnerName
+
 	ctx.HTML(200, tplCollaboration)
 }
 

templates/repo/settings/collaboration.tmpl

@@ -51,6 +51,49 @@
 				<button class="ui green button">{{.i18n.Tr "repo.settings.add_collaborator"}}</button>
 			</form>
 		</div>
+
+		<h4 class="ui top attached header">
+			Teams
+		</h4>
+		{{if .Teams}}
+		<div class="ui attached segment collaborator list">
+			{{range .Teams}}
+				<div class="item ui grid">
+					<div class="ui five wide column">
+						<a href="{{AppSubUrl}}/org/{{$.Org}}/teams/{{.LowerName}}">
+							{{.Name}}
+						</a>
+					</div>
+					<div class="ui eight wide column poping up" data-content="This team has write access to code, issues and pull requests" > <!-- TODO: Replace with actual rights (depending on what is enabled in repo)-->
+						<span class="octicon octicon-shield"></span>
+						<div class="ui inline dropdown">
+							<div class="text">{{$.i18n.Tr .ModeI18nKey}}</div>
+						</div>
+					</div>
+					<div class="ui two wide column">
+						{{if (not (eq .LowerName "owners"))}}
+							<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
+								{{$.i18n.Tr "repo.settings.delete_collaborator"}}
+							</button>
+						{{end}}
+					</div>
+				</div>
+			{{end}}
+		</div>
+		{{end}}
+		<div class="ui bottom attached segment">
+			<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="inline field ui left">
+					<div id="search-team-box" class="ui search" data-org="{{.Org}}">
+						<div class="ui input">
+							<input class="prompt" name="team" placeholder="Search teams..." autocomplete="off" autofocus required>
+						</div>
+					</div>
+				</div>
+				<button class="ui green button">Add Team</button>
+			</form>
+		</div>
 	</div>
 </div>