Merge e49147f3083b1bedeab6be9384cd93e26c12de01 into f70f2c76cb31e5770522b8442db765da0569be96

models/organization/org.go

@@ -596,3 +596,26 @@ 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
+	}
+
+	return db.GetEngine(ctx).
+		Table("team").
+		Join("INNER", "team_user", "team_user.team_id = team.id").
+		Where("team_user.uid = ?", user.ID).
+		And("team.org_id = ?", org.ID).
+		And("team.includes_all_repositories = ?", true).
+		And("team.authorize >= ?", perm.AccessModeAdmin).
+		Exist(new(Team))
+}

models/organization/team_list.go

@@ -96,6 +96,19 @@ func SearchTeam(ctx context.Context, opts *SearchTeamOptions) (TeamList, int64,
 	return teams, count, nil
 }
 
+// CountTeam counts teams matching the given options without loading full team objects.
+func CountTeam(ctx context.Context, opts *SearchTeamOptions) (int64, error) {
+	sess := db.GetEngine(ctx)
+
+	cond := opts.toCond()
+
+	if opts.UserID > 0 {
+		sess = sess.Join("INNER", "team_user", "team_user.team_id = team.id")
+	}
+
+	return sess.Where(cond).Count(new(Team))
+}
+
 // GetRepoTeams gets the list of teams that has access to the repository
 func GetRepoTeams(ctx context.Context, orgID, repoID int64) (teams TeamList, err error) {
 	return teams, db.GetEngine(ctx).

routers/web/org/home.go

@@ -99,6 +99,22 @@ func home(ctx *context.Context, viewRepositories bool) {
 		return
 	}
 	ctx.Data["Members"] = members
+	if ctx.Org.IsMember && ctx.Org.Teams == nil {
+		shouldSeeAllTeams, err := ctx.Org.Organization.CanUserSeeAllTeams(ctx, ctx.Doer)
+		if err != nil {
+			ctx.ServerError("CanUserSeeAllTeams", err)
+			return
+		}
+		if shouldSeeAllTeams {
+			ctx.Org.Teams, err = ctx.Org.Organization.LoadTeams(ctx)
+		} else {
+			ctx.Org.Teams, err = ctx.Org.Organization.GetUserTeams(ctx, ctx.Doer.ID)
+		}
+		if err != nil {
+			ctx.ServerError("LoadTeams", err)
+			return
+		}
+	}
 	ctx.Data["Teams"] = ctx.Org.Teams
 	ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
 	ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0

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)
 }

routers/web/user/home.go

@@ -60,6 +60,22 @@ func prepareDashboardContextUserOrgTeams(ctx *context.Context) *user_model.User
 	orgName := ctx.PathParam("org")
 	if len(orgName) > 0 {
 		ctxUser = ctx.Org.Organization.AsUser()
+		if ctx.Org.IsMember && ctx.Org.Teams == nil {
+			shouldSeeAllTeams, err := ctx.Org.Organization.CanUserSeeAllTeams(ctx, ctx.Doer)
+			if err != nil {
+				ctx.ServerError("CanUserSeeAllTeams", err)
+				return nil
+			}
+			if shouldSeeAllTeams {
+				ctx.Org.Teams, err = ctx.Org.Organization.LoadTeams(ctx)
+			} else {
+				ctx.Org.Teams, err = ctx.Org.Organization.GetUserTeams(ctx, ctx.Doer.ID)
+			}
+			if err != nil {
+				ctx.ServerError("LoadTeams", err)
+				return nil
+			}
+		}
 		ctx.Data["Teams"] = ctx.Org.Teams
 	}
 	ctx.Data["ContextUser"] = ctxUser

services/context/org.go

@@ -175,40 +175,50 @@ 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 {
-					ctx.ServerError("LoadTeams", err)
-					return
-				}
-			} else {
-				ctx.Org.Teams, err = org.GetUserTeams(ctx, ctx.Doer.ID)
-				if err != nil {
-					ctx.ServerError("GetUserTeams", err)
-					return
-				}
+
+			countOpts := &organization.SearchTeamOptions{
+				OrgID: org.ID,
 			}
-			ctx.Data["NumTeams"] = len(ctx.Org.Teams)
+			if !shouldSeeAllTeams {
+				countOpts.UserID = ctx.Doer.ID
+			}
+			numTeams, err := organization.CountTeam(ctx, countOpts)
+			if err != nil {
+				ctx.ServerError("CountTeam", err)
+				return
+			}
+			ctx.Data["NumTeams"] = numTeams
 		}
 
 		teamName := ctx.PathParam("team")
 		if len(teamName) > 0 {
+			if ctx.Org.Teams == nil && ctx.Org.IsMember {
+				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 {
+						ctx.ServerError("LoadTeams", err)
+						return
+					}
+				} else {
+					ctx.Org.Teams, err = org.GetUserTeams(ctx, ctx.Doer.ID)
+					if err != nil {
+						ctx.ServerError("GetUserTeams", err)
+						return
+					}
+				}
+			}
+
 			teamExists := false
 			for _, team := range ctx.Org.Teams {
 				if strings.EqualFold(team.LowerName, teamName) {

templates/org/team/teams.tmpl

@@ -8,9 +8,19 @@
 				<div class="tw-flex-1">{{ctx.Locale.Tr "org.teams.manage_team_member_prompt"}}</div>
 				<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">
@@ -31,6 +41,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" .}}
@@ -42,6 +57,7 @@
 				</div>
 			{{end}}
 		</div>
+		{{template "base/paginate" .}}
 	</div>
 </div>
 <div class="ui g-modal-confirm delete modal" id="leave-team">