Commit 397dfc54 by Torkel Ödegaard

Fixed bug in png rendering when having changed public url

parent eeba128f
...@@ -14,9 +14,7 @@ src/css/*.min.css ...@@ -14,9 +14,7 @@ src/css/*.min.css
*.swp *.swp
.idea/ .idea/
data/sessions /data/*
data/*.db
data/log
/bin/* /bin/*
/grafana-pro /grafana-pro
......
...@@ -6,6 +6,7 @@ import ( ...@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana/pkg/components/renderer" "github.com/grafana/grafana/pkg/components/renderer"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )
...@@ -19,7 +20,7 @@ func RenderToPng(c *middleware.Context) { ...@@ -19,7 +20,7 @@ func RenderToPng(c *middleware.Context) {
Height: queryReader.Get("height", "400"), Height: queryReader.Get("height", "400"),
} }
renderOpts.Url = "http://localhost:3000/" + renderOpts.Url renderOpts.Url = setting.ToAbsUrl(renderOpts.Url)
pngPath, err := renderer.RenderToPng(renderOpts) pngPath, err := renderer.RenderToPng(renderOpts)
if err != nil { if err != nil {
......
...@@ -81,7 +81,7 @@ func Search(c *middleware.Context) { ...@@ -81,7 +81,7 @@ func Search(c *middleware.Context) {
result.Dashboards = query.Result result.Dashboards = query.Result
for _, dash := range result.Dashboards { for _, dash := range result.Dashboards {
dash.Url = setting.AbsUrlTo("dashboard/db/" + dash.Slug) dash.Url = setting.ToAbsUrl("dashboard/db/" + dash.Slug)
} }
} }
......
...@@ -148,7 +148,7 @@ func parseAppUrlAndSubUrl(section *ini.Section) (string, string) { ...@@ -148,7 +148,7 @@ func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
return appUrl, appSubUrl return appUrl, appSubUrl
} }
func AbsUrlTo(relativeUrl string) string { func ToAbsUrl(relativeUrl string) string {
return AppUrl + relativeUrl return AppUrl + relativeUrl
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment