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

[3743] Adds support for user search based on login or email (#7334)

Browse Source 
* [3743] Adds support for user search based on login or email

* Use query parameter instead

* Use macaron Query() instead
This commit is contained in:
Pavlos Daoglou
2017-01-31 07:25:55 +02:00
committed by Torkel Ödegaard
parent bd4eadf69c
commit 3e741315b4
3 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@@ -126,6 +126,8 @@ func Register(r *macaron.Macaron) {
r.Get("/", wrap(SearchUsers))
r.Get("/:id", wrap(GetUserById))
r.Get("/:id/orgs", wrap(GetUserOrgList))
// query parameters /users/lookup?loginOrEmail=admin@example.com
r.Get("/lookup", wrap(GetUserByLoginOrEmail))
r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser))
r.Post("/:id/using/:orgId", wrap(UpdateUserActiveOrg))
}, reqGrafanaAdmin)