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

Fixes issues with user and team picker

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-12-17 14:31:43 +01:00
parent 3efaf52049
commit e38a04ba9a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/core/components/Select/TeamPicker.tsx
View File

@ -1,4 +1,5 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import _ from 'lodash';
import { AsyncSelect } from './Select'; import { AsyncSelect } from './Select';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
import { getBackendSrv } from 'app/core/services/backend_srv'; import { getBackendSrv } from 'app/core/services/backend_srv';
@ -37,6 +38,10 @@ export class TeamPicker extends Component<Props, State> {
const backendSrv = getBackendSrv(); const backendSrv = getBackendSrv();
this.setState({ isLoading: true }); this.setState({ isLoading: true });
if (_.isNil(query)) {
query = '';
}
return backendSrv.get(`/api/teams/search?perpage=10&page=1&query=${query}`).then(result => { return backendSrv.get(`/api/teams/search?perpage=10&page=1&query=${query}`).then(result => {
const teams = result.teams.map(team => { const teams = result.teams.map(team => {
return { return {

5
public/app/core/components/Select/UserPicker.tsx
View File

@ -1,5 +1,6 @@
// Libraries // Libraries
import React, { Component } from 'react'; import React, { Component } from 'react';
import _ from 'lodash';
// Components // Components
import { AsyncSelect } from './Select'; import { AsyncSelect } from './Select';
@ -38,6 +39,10 @@ export class UserPicker extends Component<Props, State> {
const backendSrv = getBackendSrv(); const backendSrv = getBackendSrv();
this.setState({ isLoading: true }); this.setState({ isLoading: true });
if (_.isNil(query)) {
query = '';
}
return backendSrv return backendSrv
.get(`/api/org/users?query=${query}&limit=10`) .get(`/api/org/users?query=${query}&limit=10`)
.then(result => { .then(result => {