mirror of
https://github.com/grafana/grafana.git
synced 2024-12-02 05:29:42 -06:00
893a91af3a
This commit fixes the following unindent findings:
pkg/api/common.go:102:2: "if x { if y" should be "if x && y"
pkg/components/dynmap/dynmap.go:642:2: invert condition and early return
pkg/components/dynmap/dynmap.go:681:2: invert condition and early return
pkg/components/simplejson/simplejson.go:171:2: "if x { if y" should be "if x && y"
pkg/middleware/dashboard_redirect.go:42:3: invert condition and early return
pkg/tsdb/mssql/mssql.go:301:3: invert condition and early break
pkg/tsdb/mysql/mysql.go:312:3: invert condition and early break
pkg/tsdb/postgres/postgres.go:292:3: invert condition and early break
pkg/tsdb/sql_engine.go:144:2: invert condition and early return
55 lines
1.3 KiB
Go
55 lines
1.3 KiB
Go
package middleware
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/grafana/grafana/pkg/bus"
|
|
m "github.com/grafana/grafana/pkg/models"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
"gopkg.in/macaron.v1"
|
|
)
|
|
|
|
func getDashboardURLBySlug(orgID int64, slug string) (string, error) {
|
|
query := m.GetDashboardQuery{Slug: slug, OrgId: orgID}
|
|
|
|
if err := bus.Dispatch(&query); err != nil {
|
|
return "", m.ErrDashboardNotFound
|
|
}
|
|
|
|
return m.GetDashboardUrl(query.Result.Uid, query.Result.Slug), nil
|
|
}
|
|
|
|
func RedirectFromLegacyDashboardURL() macaron.Handler {
|
|
return func(c *m.ReqContext) {
|
|
slug := c.Params("slug")
|
|
|
|
if slug == "" {
|
|
return
|
|
}
|
|
if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
|
|
url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
|
|
c.Redirect(url, 301)
|
|
}
|
|
}
|
|
}
|
|
|
|
func RedirectFromLegacyDashboardSoloURL() macaron.Handler {
|
|
return func(c *m.ReqContext) {
|
|
slug := c.Params("slug")
|
|
renderRequest := c.QueryBool("render")
|
|
|
|
if slug == "" {
|
|
return
|
|
}
|
|
if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
|
|
if renderRequest && strings.Contains(url, setting.AppSubUrl) {
|
|
url = strings.Replace(url, setting.AppSubUrl, "", 1)
|
|
}
|
|
url = strings.Replace(url, "/d/", "/d-solo/", 1)
|
|
url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
|
|
c.Redirect(url, 301)
|
|
}
|
|
}
|
|
}
|