From 10131aa8a0830d0c2e39d2fdbd0f907021930701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 Apr 2016 12:23:29 -0400 Subject: [PATCH] fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686 --- CHANGELOG.md | 7 ++++++- pkg/api/api.go | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3579807e1df..e5d3e899e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -# 3.0.0-beta3 (unreleased) +# 3.0.0-beta4 (unreleased) + +### Bug fixes +* **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686) + +# 3.0.0-beta3 (2016-04-12) ### Enhancements * **InfluxDB**: Changed multi query encoding to work with InfluxDB 0.11 & 0.12, closes [#4533](https://github.com/grafana/grafana/issues/4533) diff --git a/pkg/api/api.go b/pkg/api/api.go index fae78053962..9a0e81434f3 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -191,9 +191,9 @@ func Register(r *macaron.Macaron) { r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn) - r.Group("/plugins", func() { - r.Get("/", wrap(GetPluginList)) + r.Get("/plugins", wrap(GetPluginList)) + r.Group("/plugins", func() { r.Get("/:pluginId/readme", wrap(GetPluginReadme)) r.Get("/:pluginId/dashboards/", wrap(GetPluginDashboards)) r.Get("/:pluginId/settings", wrap(GetPluginSettingById))