IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

teams: team listing shows only your teams (editors).

Browse Source
This commit is contained in:
Leonard Gram
2019-03-11 14:40:57 +01:00
parent 1f949e58e1
commit 89d4db8eb6
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/api/team.go
View File

@@ -86,12 +86,18 @@ func SearchTeams(c *m.ReqContext) Response {
page = 1 page = 1
} }
var userIdFilter int64
if c.QueryBool("showMine") {
userIdFilter = c.SignedInUser.UserId
}
query := m.SearchTeamsQuery{ query := m.SearchTeamsQuery{
OrgId: c.OrgId, OrgId: c.OrgId,
Query: c.Query("query"), Query: c.Query("query"),
Name: c.Query("name"), Name: c.Query("name"),
Page: page, UserIdFilter: userIdFilter,
Limit: perPage, Page: page,
Limit: perPage,
} }
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {

11
pkg/models/team.go
View File

@@ -61,11 +61,12 @@ type GetTeamsByUserQuery struct {
} }
type SearchTeamsQuery struct { type SearchTeamsQuery struct {
Query string Query string
Name string Name string
Limit int Limit int
Page int Page int
OrgId int64 OrgId int64
UserIdFilter int64
Result SearchTeamQueryResult Result SearchTeamQueryResult
} }

4
pkg/services/sqlstore/team.go
View File

@@ -149,6 +149,10 @@ func SearchTeams(query *m.SearchTeamsQuery) error {
params := make([]interface{}, 0) params := make([]interface{}, 0)
sql.WriteString(getTeamSelectSqlBase()) sql.WriteString(getTeamSelectSqlBase())
if query.UserIdFilter > 0 {
sql.WriteString(`INNER JOIN team_member on team.id = team_member.team_id AND team_member.user_id = ?`)
params = append(params, query.UserIdFilter)
}
sql.WriteString(` WHERE team.org_id = ?`) sql.WriteString(` WHERE team.org_id = ?`)
params = append(params, query.OrgId) params = append(params, query.OrgId)

6
public/app/features/teams/state/actions.ts
View File

@@ -1,8 +1,9 @@
import { ThunkAction } from 'redux-thunk'; import { ThunkAction } from 'redux-thunk';
import { getBackendSrv } from 'app/core/services/backend_srv'; import { getBackendSrv } from 'app/core/services/backend_srv';
import { StoreState, Team, TeamGroup, TeamMember } from 'app/types'; import { OrgRole, StoreState, Team, TeamGroup, TeamMember } from 'app/types';
import { updateNavIndex, UpdateNavIndexAction } from 'app/core/actions'; import { updateNavIndex, UpdateNavIndexAction } from 'app/core/actions';
import { buildNavModel } from './navModel'; import { buildNavModel } from './navModel';
import { contextSrv } from '../../../core/services/context_srv';
export enum ActionTypes { export enum ActionTypes {
LoadTeams = 'LOAD_TEAMS', LoadTeams = 'LOAD_TEAMS',
@@ -85,7 +86,8 @@ export const setSearchQuery = (searchQuery: string): SetSearchQueryAction => ({
export function loadTeams(): ThunkResult<void> { export function loadTeams(): ThunkResult<void> {
return async dispatch => { return async dispatch => {
const response = await getBackendSrv().get('/api/teams/search', { perpage: 1000, page: 1 }); const showMine = contextSrv.user.orgRole === OrgRole.Editor;
const response = await getBackendSrv().get('/api/teams/search', { perpage: 1000, page: 1, showMine });
dispatch(teamsLoaded(response.teams)); dispatch(teamsLoaded(response.teams));
}; };
} }