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

Tokens small fixes

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-16 12:28:35 +01:00
parent 9feb8a73fd
commit aa9ca68883
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

@ -1 +1 @@
Subproject commit d3cc6e518dfd2ceb26c0e568bc603b4473b11a02
Subproject commit aaa717aac2c1f5e440d61cbe08e55357b4d2570b

2
pkg/api/api.go
View File

@ -25,6 +25,8 @@ func Register(r *macaron.Macaron) {
// authed views
r.Get("/account/", reqSignedIn, Index)
r.Get("/account/datasources/", reqSignedIn, Index)
r.Get("/account/collaborators/", reqSignedIn, Index)
r.Get("/account/apikeys/", reqSignedIn, Index)
r.Get("/admin", reqSignedIn, Index)
r.Get("/dashboard/*", reqSignedIn, Index)

6
pkg/api/token.go
View File

@ -8,7 +8,7 @@ import (
)
func GetTokens(c *middleware.Context) {
query := m.GetTokensQuery{AccountId: c.Account.Id}
query := m.GetTokensQuery{AccountId: c.UserAccount.Id}
err := bus.Dispatch(&query)
if err != nil {
@ -47,7 +47,7 @@ func AddToken(c *middleware.Context, cmd m.AddTokenCommand) {
return
}
cmd.AccountId = c.Account.Id
cmd.AccountId = c.UserAccount.Id
cmd.Token = util.GetRandomString(64)
if err := bus.Dispatch(&cmd); err != nil {
@ -71,7 +71,7 @@ func UpdateToken(c *middleware.Context, cmd m.UpdateTokenCommand) {
return
}
cmd.AccountId = c.Account.Id
cmd.AccountId = c.UserAccount.Id
err := bus.Dispatch(&cmd)
if err != nil {

1
pkg/models/account.go
View File

@ -6,7 +6,6 @@ import (
)
// Typed errors
var (
ErrAccountNotFound = errors.New("Account not found")
)