IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-14 07:04:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '13425-team-picker-bug'

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-10-11 12:52:48 -07:00
parent b49f4a8c86 c368c72d40
commit 69e0311cbc
32 changed files with 1083 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/org_users.go
+1 -1
View File
@@ -45,7 +45,7 @@ func addOrgUserHelper(cmd m.AddOrgUserCommand) Response {
// GET /api/org/users
func GetOrgUsersForCurrentOrg(c *m.ReqContext) Response {
return getOrgUsersHelper(c.OrgId, c.Params("query"), c.ParamsInt("limit"))
return getOrgUsersHelper(c.OrgId, c.Query("query"), c.QueryInt("limit"))
}
// GET /api/orgs/:orgId/users