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

Saving home dashboard id in table

Browse Source
This commit is contained in:
utkarshcmu 2016-03-16 23:22:27 -07:00
parent a88176e060
commit 749fd618a9
4 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/api.go
View File

@ -160,7 +160,12 @@ func Register(r *macaron.Macaron) {
r.Delete("/:id", wrap(DeleteApiKey)) r.Delete("/:id", wrap(DeleteApiKey))
}, reqOrgAdmin) }, reqOrgAdmin)
r.Combo("/preferences").Get(GetPreferences).Put(bind(m.SavePreferencesCommand{}), wrap(SavePreferences)) // Preferences
r.Group("/preferences", func() {
r.Get("/", wrap(GetPreferences))
r.Put("/", bind(m.SavePreferencesCommand{}), wrap(SavePreferences))
r.Post("/set-home-dash", bind(m.SavePreferencesCommand{}), wrap(SetHomeDashboard))
})
// Data sources // Data sources
r.Group("/datasources", func() { r.Group("/datasources", func() {

18
pkg/api/preferences.go
View File

@ -7,7 +7,7 @@ import (
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
// PUT /api/user/prefs // PUT /api/preferences
func SavePreferences(c *middleware.Context, cmd m.SavePreferencesCommand) Response { func SavePreferences(c *middleware.Context, cmd m.SavePreferencesCommand) Response {
cmd.UserId = c.UserId cmd.UserId = c.UserId
@ -21,7 +21,7 @@ func SavePreferences(c *middleware.Context, cmd m.SavePreferencesCommand) Respon
} }
// GET /api/user/prefs // GET /api/preferences
func GetPreferences(c *middleware.Context) { func GetPreferences(c *middleware.Context) {
query := m.GetPreferencesQuery{UserId: c.UserId, OrgId: c.OrgId} query := m.GetPreferencesQuery{UserId: c.UserId, OrgId: c.OrgId}
@ -38,3 +38,17 @@ func GetPreferences(c *middleware.Context) {
c.JSON(200, dto) c.JSON(200, dto)
} }
// POST /api/preferences/set-home-dash
func SetHomeDashboard(c *middleware.Context, cmd m.SavePreferencesCommand) Response {
cmd.UserId = c.UserId
cmd.OrgId = c.OrgId
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to set home dashboard", err)
}
return ApiSuccess("Home dashboard set")
}

6
pkg/models/preferences.go
View File

@ -39,7 +39,7 @@ type SavePreferencesCommand struct {
UserId int64 UserId int64
OrgId int64 OrgId int64
HomeDashboardId int64 HomeDashboardId int64 `json:"dashboardId"`
Timezone string Timezone string `json:"timezone"`
Theme string Theme string `json:"theme"`
} }

5
pkg/services/sqlstore/preferences.go
View File

@ -1,6 +1,7 @@
package sqlstore package sqlstore
import ( import (
"time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )
@ -41,6 +42,8 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
HomeDashboardId: cmd.HomeDashboardId, HomeDashboardId: cmd.HomeDashboardId,
Timezone: cmd.Timezone, Timezone: cmd.Timezone,
Theme: cmd.Theme, Theme: cmd.Theme,
Created: time.Now(),
Updated: time.Now(),
} }
_, err = sess.Insert(&prefs) _, err = sess.Insert(&prefs)
return err return err
@ -48,6 +51,8 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
prefs.HomeDashboardId = cmd.HomeDashboardId prefs.HomeDashboardId = cmd.HomeDashboardId
prefs.Timezone = cmd.Timezone prefs.Timezone = cmd.Timezone
prefs.Theme = cmd.Theme prefs.Theme = cmd.Theme
prefs.Updated = time.Now()
prefs.Version += 1
_, err = sess.Id(prefs.Id).Update(&prefs) _, err = sess.Id(prefs.Id).Update(&prefs)
return err return err
} }