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

middlware: change org when url contains orgid

Browse Source 
closes #6948
ref #1613
This commit is contained in:
bergquist
2017-02-17 15:02:14 +01:00
parent 12f1ea71fd
commit 5174d050f2
6 changed files with 120 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/alerting/eval_context.go
View File

@@ -113,7 +113,7 @@ func (c *EvalContext) GetRuleUrl() (string, error) {
if slug, err := c.GetDashboardSlug(); err != nil {
return "", err
} else {
ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d", setting.AppUrl, slug, c.Rule.PanelId)
ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d&org-id=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId)
return ruleUrl, nil
}
}