opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 20:32:19 +08: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
Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

Submodule grafana updated: cf344abff2...5b93e09714

2
pkg/api/api.go
View File

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

2
pkg/models/account.go
View File

@ -97,7 +97,9 @@ type CollaboratorDTO struct {
type AccountSearchHitDTO struct { type AccountSearchHitDTO struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Login string `json:"login"`
Email string `json:"email"` Email string `json:"email"`
IsAdmin bool `json:"isAdmin"`
} }
type AccountDTO struct { 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 := x.Table("account")
sess.Where("email LIKE ?", query.Query+"%") sess.Where("email LIKE ?", query.Query+"%")
sess.Limit(query.Limit, query.Limit*query.Page) 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) err := sess.Find(&query.Result)
return err return err