From 5e431149cd5f69c2ababcc77b64ab4615eb663b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 20 Mar 2016 11:54:24 +0100 Subject: [PATCH] feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399 --- pkg/api/api.go | 2 -- pkg/api/preferences.go | 34 ---------------------------------- 2 files changed, 36 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index eb3f830b6c6..5241bc1abb7 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -162,8 +162,6 @@ func Register(r *macaron.Macaron) { // Preferences r.Group("/preferences", func() { - r.Get("/", GetPreferences) - r.Put("/", bind(m.SavePreferencesCommand{}), wrap(SavePreferences)) r.Post("/set-home-dash", bind(m.SavePreferencesCommand{}), wrap(SetHomeDashboard)) }) diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go index 74419492d09..490da451afc 100644 --- a/pkg/api/preferences.go +++ b/pkg/api/preferences.go @@ -1,44 +1,11 @@ package api import ( - "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" ) -// PUT /api/preferences -func SavePreferences(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 save preferences", err) - } - - return ApiSuccess("Preferences saved") - -} - -// GET /api/preferences -func GetPreferences(c *middleware.Context) { - - query := m.GetPreferencesQuery{UserId: c.UserId, OrgId: c.OrgId} - - if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to get preferences", err) - } - - dto := dtos.Preferences{ - HomeDashboardId: query.Result.HomeDashboardId, - Timezone: query.Result.Timezone, - Theme: query.Result.Theme, - } - - c.JSON(200, dto) -} - // POST /api/preferences/set-home-dash func SetHomeDashboard(c *middleware.Context, cmd m.SavePreferencesCommand) Response { @@ -50,5 +17,4 @@ func SetHomeDashboard(c *middleware.Context, cmd m.SavePreferencesCommand) Respo } return ApiSuccess("Home dashboard set") - }