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

user picker should only include users from current org (#10845)

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-02-09 10:42:37 +01:00
committed by Torkel Ödegaard
parent 864e2647db
commit a86f2fa34b
5 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/core/components/Picker/UserPicker.tsx
View File

@@ -31,7 +31,7 @@ class UserPicker extends Component<IProps, any> {
this.debouncedSearch = debounce(this.search, 300, {
leading: true,
trailing: false,
trailing: true,
});
}
@@ -39,10 +39,10 @@ class UserPicker extends Component<IProps, any> {
const { toggleLoading, backendSrv } = this.props;
toggleLoading(true);
return backendSrv.get(`/api/users/search?perpage=10&page=1&query=${query}`).then(result => {
const users = result.users.map(user => {
return backendSrv.get(`/api/org/users?query=${query}&limit=10`).then(result => {
const users = result.map(user => {
return {
id: user.id,
id: user.userId,
label: `${user.login} - ${user.email}`,
avatarUrl: user.avatarUrl,
login: user.login,