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

Accounts admin view/get api

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-15 15:54:22 +01:00
parent fdfcc3ab2a
commit 804bff55ec
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

@ -1 +1 @@
Subproject commit cf344abff2cdf7638d1748aa698caf23c3848715
Subproject commit 5b93e09714dbee6c1c181daf0182704334d8c6be

2
pkg/api/api.go
View File

@ -10,7 +10,7 @@ import (
// Register adds http routes
func Register(m *macaron.Macaron) {
reqSignedIn := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true})
reqAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqAdmin: false})
reqAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqAdmin: true})
// not logged in views
m.Get("/", reqSignedIn, Index)

8
pkg/models/account.go
View File

@ -95,9 +95,11 @@ type CollaboratorDTO struct {
}
type AccountSearchHitDTO struct {
Id int64 `json:"id"`
Name string `json:"name"`
Email string `json:"email"`
Id int64 `json:"id"`
Name string `json:"name"`
Login string `json:"login"`
Email string `json:"email"`
IsAdmin bool `json:"isAdmin"`
}
type AccountDTO struct {

2
pkg/services/sqlstore/accounts.go
View File

@ -188,7 +188,7 @@ func SearchAccounts(query *m.SearchAccountsQuery) error {
sess := x.Table("account")
sess.Where("email LIKE ?", query.Query+"%")
sess.Limit(query.Limit, query.Limit*query.Page)
sess.Cols("id", "email", "name")
sess.Cols("id", "email", "name", "login", "is_admin")
err := sess.Find(&query.Result)
return err