Merge 69a5decd9187d6c401be25db2a8e5c26b2aed160 into bbea5e6c2d75a4a710d7838b7bec7e851e046d3c

models/organization/org.go

@@ -596,3 +596,30 @@ func getUserTeamIDsQueryBuilder(orgID, userID int64) *builder.Builder {
 			"team_user.uid":    userID,
 		})
 }
+
+// CanUserSeeAllTeams returns true if user can see all teams in organization
+func (org *Organization) CanUserSeeAllTeams(ctx context.Context, user *user_model.User) (bool, error) {
+	if user.IsAdmin {
+		return true, nil
+	}
+	isOwner, err := org.IsOwnedBy(ctx, user.ID)
+	if err != nil {
+		return false, err
+	}
+	if isOwner {
+		return true, nil
+	}
+
+	teams, err := org.GetUserTeams(ctx, user.ID)
+	if err != nil {
+		return false, err
+	}
+
+	for _, team := range teams {
+		if team.IncludesAllRepositories && team.HasAdminAccess() {
+			return true, nil
+		}
+	}
+
+	return false, nil
+}

routers/web/org/teams.go

@@ -54,13 +54,47 @@ func Teams(ctx *context.Context) {
 	ctx.Data["Title"] = org.FullName
 	ctx.Data["PageIsOrgTeams"] = true
 
-	for _, t := range ctx.Org.Teams {
+	page := max(ctx.FormInt("page"), 1)
+	keyword := ctx.FormTrim("q")
+
+	opts := &org_model.SearchTeamOptions{
+		Keyword:     keyword,
+		OrgID:       org.ID,
+		IncludeDesc: true,
+		ListOptions: db.ListOptions{
+			Page:     page,
+			PageSize: setting.UI.MembersPagingNum,
+		},
+	}
+
+	canSeeAllTeams, err := ctx.Org.Organization.CanUserSeeAllTeams(ctx, ctx.Doer)
+	if err != nil {
+		ctx.ServerError("CanUserSeeAllTeams", err)
+		return
+	}
+	if !canSeeAllTeams {
+		opts.UserID = ctx.Doer.ID
+	}
+
+	teams, count, err := org_model.SearchTeam(ctx, opts)
+	if err != nil {
+		ctx.ServerError("SearchTeam", err)
+		return
+	}
+
+	for _, t := range teams {
 		if err := t.LoadMembers(ctx); err != nil {
 			ctx.ServerError("GetMembers", err)
 			return
 		}
 	}
-	ctx.Data["Teams"] = ctx.Org.Teams
+
+	pager := context.NewPagination(int(count), setting.UI.MembersPagingNum, page, 5)
+	pager.AddParamFromRequest(ctx.Req)
+	ctx.Data["Page"] = pager
+	ctx.Data["Teams"] = teams
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Total"] = count
 
 	ctx.HTML(http.StatusOK, tplTeams)
 }

services/context/org.go

@@ -173,22 +173,12 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) {
 
 		// Team.
 		if ctx.Org.IsMember {
-			shouldSeeAllTeams := false
-			if ctx.Org.IsOwner {
-				shouldSeeAllTeams = true
-			} else {
-				teams, err := org.GetUserTeams(ctx, ctx.Doer.ID)
-				if err != nil {
-					ctx.ServerError("GetUserTeams", err)
-					return
-				}
-				for _, team := range teams {
-					if team.IncludesAllRepositories && team.HasAdminAccess() {
-						shouldSeeAllTeams = true
-						break
-					}
-				}
+			shouldSeeAllTeams, err := org.CanUserSeeAllTeams(ctx, ctx.Doer)
+			if err != nil {
+				ctx.ServerError("CanUserSeeAllTeams", err)
+				return
 			}
+
 			if shouldSeeAllTeams {
 				ctx.Org.Teams, err = org.LoadTeams(ctx)
 				if err != nil {

templates/org/team/teams.tmpl

@@ -7,9 +7,19 @@
 			<div class="flex-text-block tw-justify-end">
 				<a class="ui primary button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}}</a>
 			</div>
-			<div class="divider"></div>
 		{{end}}
 
+		<div class="ui secondary filter menu tw-mx-0">
+			<form class="ui form ignore-dirty tw-flex-1" method="get">
+				<div class="ui fluid action input">
+					<input type="search" name="q" value="{{$.Keyword}}" placeholder="{{ctx.Locale.Tr "search.team_kind"}}" maxlength="255" spellcheck="false" autofocus>
+					<button class="ui primary button" type="submit">{{svg "octicon-search"}}</button>
+				</div>
+			</form>
+		</div>
+
+		<div class="divider"></div>
+
 		<div class="ui two column stackable grid">
 			{{range .Teams}}
 				<div class="column">
@@ -30,6 +40,11 @@
 							{{end}}
 						</div>
 					</div>
+					{{if .Description}}
+						<div class="ui attached segment">
+							<p class="tw-text-sm tw-text-secondary tw-my-0">{{.Description}}</p>
+						</div>
+					{{end}}
 					<div class="ui attached segment members">
 						{{range .Members}}
 							{{template "shared/user/avatarlink" dict "user" .}}
@@ -41,6 +56,7 @@
 				</div>
 			{{end}}
 		</div>
+		{{template "base/paginate" .}}
 	</div>
 </div>
 <div class="ui g-modal-confirm delete modal" id="leave-team">