IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

org: fixed issue with orgId query param redirect handling when grafana is under subpath and reverse proxy, fixes #8089

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-04-12 07:10:46 +02:00
parent d2bf2e86ed
commit b3df1aa9bd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/middleware/org_redirect.go
View File

@ -1,11 +1,13 @@
package middleware package middleware
import ( import (
"fmt"
"net/http" "net/http"
"strconv" "strconv"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"
) )
@ -39,6 +41,7 @@ func OrgRedirect() macaron.Handler {
return return
} }
c.Redirect(c.Req.URL.String(), 302) newUrl := setting.ToAbsUrl(fmt.Sprintf("%s?%s", c.Req.URL.Path, c.Req.URL.Query().Encode()))
c.Redirect(newUrl, 302)
} }
} }