mirror of
https://github.com/grafana/grafana.git
synced 2025-02-20 11:48:34 -06:00
Fixed bug in png rendering when having changed public url
This commit is contained in:
parent
eeba128f8a
commit
397dfc54cd
4
.gitignore
vendored
4
.gitignore
vendored
@ -14,9 +14,7 @@ src/css/*.min.css
|
||||
*.swp
|
||||
.idea/
|
||||
|
||||
data/sessions
|
||||
data/*.db
|
||||
data/log
|
||||
/data/*
|
||||
/bin/*
|
||||
/grafana-pro
|
||||
|
||||
|
@ -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 {
|
||||
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -148,7 +148,7 @@ func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
|
||||
return appUrl, appSubUrl
|
||||
}
|
||||
|
||||
func AbsUrlTo(relativeUrl string) string {
|
||||
func ToAbsUrl(relativeUrl string) string {
|
||||
return AppUrl + relativeUrl
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user