From b866383ec0d1db17b577d44db60edab8ac084eba Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 16 Oct 2017 14:09:52 +0200 Subject: [PATCH 1/2] api: fix for dashboard version history --- pkg/api/api.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index fa5854b5333..957e2e06c0a 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -248,9 +248,9 @@ func (hs *HttpServer) registerRoutes() { dashboardRoute.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard)) dashboardRoute.Group("/id/:dashboardId", func(dashIdRoute RouteRegister) { - dashIdRoute.Get("/id/:dashboardId/versions", wrap(GetDashboardVersions)) - dashIdRoute.Get("/id/:dashboardId/versions/:id", wrap(GetDashboardVersion)) - dashIdRoute.Post("/id/:dashboardId/restore", reqEditorRole, bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion)) + dashIdRoute.Get("/versions", wrap(GetDashboardVersions)) + dashIdRoute.Get("/versions/:id", wrap(GetDashboardVersion)) + dashIdRoute.Post("/restore", reqEditorRole, bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion)) dashIdRoute.Group("/acl", func(aclRoute RouteRegister) { aclRoute.Get("/", wrap(GetDashboardAclList)) From 5f6ab1e37003c91fc453f057bbb196660b7356f0 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 16 Oct 2017 14:11:52 +0200 Subject: [PATCH 2/2] styleguide: fix link in index --- pkg/api/index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/index.go b/pkg/api/index.go index 0f4674cdd9c..efc83776fa5 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -270,7 +270,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { {Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"}, {Text: "Server Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings"}, {Text: "Server Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats"}, - {Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/admin/styleguide"}, + {Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/styleguide"}, }, }) }