Commit b8b61824 by Boris Granveaud Committed by Torkel Ödegaard

Rendering: Fix panel PNG rendering when using sub url & serve_from_sub_path = true (#21306)

* Rendering: fix dashboard rendering when using sub url

* rollback on render.go: no need to add sub-path
parent 1ba072cd
......@@ -43,7 +43,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
appSubURL := setting.AppSubUrl
// special case when doing localhost call from phantomjs
if c.IsRenderCall {
if c.IsRenderCall && !hs.Cfg.ServeFromSubPath {
appURL = fmt.Sprintf("%s://localhost:%s", setting.Protocol, setting.HttpPort)
appSubURL = ""
settings["appSubUrl"] = ""
......
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