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
This commit is contained in:
Boris Granveaud 2020-01-06 08:12:18 +01:00 committed by Torkel Ödegaard
parent 1ba072cd58
commit b8b618241e

View File

@ -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"] = ""