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

Small fixes

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-19 19:10:29 +01:00
parent e750508d76
commit 581efa857b
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

@ -1 +1 @@
Subproject commit efe7279eadeffc4ba9f5a7b340e4ecdf4d208218 Subproject commit 590c3b4b50195cacf02fbd0456d55ef69db16b79

8
pkg/api/api.go
View File

@ -24,13 +24,13 @@ func Register(r *macaron.Macaron) {
r.Get("/login", Index) r.Get("/login", Index)
// authed views // authed views
r.Get("/user/", reqSignedIn, Index) r.Get("/profile/", reqSignedIn, Index)
r.Get("/account/", reqSignedIn, Index) r.Get("/account/", reqSignedIn, Index)
r.Get("/account/datasources/", reqSignedIn, Index) r.Get("/account/datasources/", reqSignedIn, Index)
r.Get("/account/collaborators/", reqSignedIn, Index) r.Get("/account/users/", reqSignedIn, Index)
r.Get("/account/apikeys/", reqSignedIn, Index) r.Get("/account/apikeys/", reqSignedIn, Index)
r.Get("/account/import/", reqSignedIn, Index) r.Get("/account/import/", reqSignedIn, Index)
r.Get("/admin", reqSignedIn, Index) r.Get("/admin/users", reqSignedIn, Index)
r.Get("/dashboard/*", reqSignedIn, Index) r.Get("/dashboard/*", reqSignedIn, Index)
// sign up // sign up
@ -49,8 +49,6 @@ func Register(r *macaron.Macaron) {
// account // account
r.Group("/account", func() { r.Group("/account", func() {
//r.Get("/", GetAccount)
//r.Post("/", bind(m.UpdateAccountCommand{}), UpdateAccount)
r.Put("/users", bind(m.AddAccountUserCommand{}), AddAccountUser) r.Put("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
r.Get("/users", GetAccountUsers) r.Get("/users", GetAccountUsers)
r.Delete("/users/:id", RemoveAccountUser) r.Delete("/users/:id", RemoveAccountUser)

4
pkg/models/account_user.go
View File

@ -58,8 +58,8 @@ type GetAccountUsersQuery struct {
// Projections and DTOs // Projections and DTOs
type AccountUserDTO struct { type AccountUserDTO struct {
AccountId int64 `json:"account_id"` AccountId int64 `json:"accountId"`
UserId int64 `json:"user_id"` UserId int64 `json:"userId"`
Email string `json:"email"` Email string `json:"email"`
Login string `json:"login"` Login string `json:"login"`
Role string `json:"role"` Role string `json:"role"`