Minor corrections

pull/4399/head
utkarshcmu 9 years ago
parent 749fd618a9
commit 9dd6aefcec
  1. 12
      pkg/api/api.go
  2. 12
      pkg/api/preferences.go
  3. 6
      pkg/models/preferences.go
  4. 10
      pkg/services/sqlstore/preferences.go
  5. 2
      public/app/features/dashboard/dashnav/dashnav.ts

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

@ -42,13 +42,13 @@ func GetPreferences(c *middleware.Context) {
// POST /api/preferences/set-home-dash // POST /api/preferences/set-home-dash
func SetHomeDashboard(c *middleware.Context, cmd m.SavePreferencesCommand) Response { func SetHomeDashboard(c *middleware.Context, cmd m.SavePreferencesCommand) Response {
cmd.UserId = c.UserId cmd.UserId = c.UserId
cmd.OrgId = c.OrgId cmd.OrgId = c.OrgId
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to set home dashboard", err) return ApiError(500, "Failed to set home dashboard", err)
} }
return ApiSuccess("Home dashboard set") return ApiSuccess("Home dashboard set")
} }

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

@ -1,9 +1,9 @@
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"
"time"
) )
func init() { func init() {
@ -42,8 +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(), Created: time.Now(),
Updated: time.Now(), Updated: time.Now(),
} }
_, err = sess.Insert(&prefs) _, err = sess.Insert(&prefs)
return err return err
@ -51,8 +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.Updated = time.Now()
prefs.Version += 1 prefs.Version += 1
_, err = sess.Id(prefs.Id).Update(&prefs) _, err = sess.Id(prefs.Id).Update(&prefs)
return err return err
} }

@ -106,7 +106,7 @@ export class DashNavCtrl {
$scope.saveDashboardAsHome = function() { $scope.saveDashboardAsHome = function() {
// TODO: this backend method needs to be implemented // TODO: this backend method needs to be implemented
backendSrv.post('/api/preferences/set-home-dash', { backendSrv.post('/api/preferences/set-home-dash', {
dashboardId: $scope.dashboard.id homeDashboardId: $scope.dashboard.id
}); });
}; };

Loading…
Cancel
Save