Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Jan 6, 2020
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee75cda
Rendering: fix dashboard rendering when using sub url
bgranvea Dec 31, 2019
500f9a9
rollback on render.go: no need to add sub-path
bgranvea Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/api/index.go
View file
Open in desktop
Expand Up @@ -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"] = ""
Expand Down