From c5afcd8e09c2d9d46a6f4f560ea4d2ea1e831adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 10 Feb 2015 10:19:43 +0100 Subject: [PATCH] Fixed issue with datasource proxying, it required account admin role when it should not --- pkg/api/api.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index fd7c7283eb4..02994d1047f 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -2,10 +2,10 @@ package api import ( "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" + "github.com/macaron-contrib/binding" ) // Register adds http routes @@ -72,9 +72,10 @@ func Register(r *macaron.Macaron) { r.Group("/datasources", func() { r.Combo("/").Get(GetDataSources).Put(AddDataSource).Post(UpdateDataSource) r.Delete("/:id", DeleteDataSource) - r.Any("/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest) }, reqAccountAdmin) + r.Any("/datasources/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest) + // Dashboard r.Group("/dashboards", func() { r.Combo("/db/:slug").Get(GetDashboard).Delete(DeleteDashboard)