Fixed bug in png rendering when having changed public url

This commit is contained in:
Torkel Ödegaard
2015-02-06 14:17:40 +01:00
parent eeba128f8a
commit 397dfc54cd
4 changed files with 5 additions and 6 deletions

View File

@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana/pkg/components/renderer"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
@@ -19,7 +20,7 @@ func RenderToPng(c *middleware.Context) {
Height: queryReader.Get("height", "400"),
}
renderOpts.Url = "http://localhost:3000/" + renderOpts.Url
renderOpts.Url = setting.ToAbsUrl(renderOpts.Url)
pngPath, err := renderer.RenderToPng(renderOpts)
if err != nil {

View File

@@ -81,7 +81,7 @@ func Search(c *middleware.Context) {
result.Dashboards = query.Result
for _, dash := range result.Dashboards {
dash.Url = setting.AbsUrlTo("dashboard/db/" + dash.Slug)
dash.Url = setting.ToAbsUrl("dashboard/db/" + dash.Slug)
}
}