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

Fixes for update user and add token

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-19 18:57:51 +01:00
parent 90925273a0
commit e750508d76
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

@ -1 +1 @@
Subproject commit 1c5f902770c260f9bc63a0f07f1e9d22f60ce796
Subproject commit efe7279eadeffc4ba9f5a7b340e4ecdf4d208218

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

@ -13,7 +13,7 @@ func init() {
bus.AddHandler("sql", GetTokenByToken)
bus.AddHandler("sql", UpdateToken)
bus.AddHandler("sql", DeleteToken)
bus.AddHandler("sql", DeleteToken)
bus.AddHandler("sql", AddToken)
}
func GetTokens(query *m.GetTokensQuery) error {

16
pkg/services/sqlstore/user.go
View File

@ -12,6 +12,7 @@ import (
func init() {
bus.AddHandler("sql", CreateUser)
bus.AddHandler("sql", UpdateUser)
bus.AddHandler("sql", GetUserByLogin)
bus.AddHandler("sql", SetUsingAccount)
bus.AddHandler("sql", GetUserInfo)
@ -92,6 +93,21 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
return nil
}
func UpdateUser(cmd *m.UpdateUserCommand) error {
return inTransaction(func(sess *xorm.Session) error {
user := m.User{
Name: cmd.Name,
Email: cmd.Email,
Login: cmd.Login,
Updated: time.Now(),
}
_, err := sess.Id(cmd.UserId).Update(&user)
return err
})
}
func SetUsingAccount(cmd *m.SetUsingAccountCommand) error {
return inTransaction(func(sess *xorm.Session) error {
user := m.User{}