From 6115941df083462394d652469bcc6625cb19c21b Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 17 Feb 2017 15:18:40 +0100 Subject: [PATCH] middleware: rename org-id -> orgId --- pkg/middleware/org_redirect.go | 2 +- pkg/middleware/org_redirect_test.go | 4 ++-- pkg/services/alerting/eval_context.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/middleware/org_redirect.go b/pkg/middleware/org_redirect.go index 7dda59c01e4..b1146a500e1 100644 --- a/pkg/middleware/org_redirect.go +++ b/pkg/middleware/org_redirect.go @@ -11,7 +11,7 @@ import ( func OrgRedirect() macaron.Handler { return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { - orgId := c.QueryInt64("org-id") + orgId := c.QueryInt64("orgId") if orgId == 0 { return } diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go index 1b0be22fd28..1f3d01f30f2 100644 --- a/pkg/middleware/org_redirect_test.go +++ b/pkg/middleware/org_redirect_test.go @@ -28,7 +28,7 @@ func TestOrgRedirectMiddleware(t *testing.T) { }) sc.m.Get("/", sc.defaultHandler) - sc.fakeReq("GET", "/?org-id=3").exec() + sc.fakeReq("GET", "/?orgId=3").exec() Convey("change org and redirect", func() { So(sc.resp.Code, ShouldEqual, 302) @@ -50,7 +50,7 @@ func TestOrgRedirectMiddleware(t *testing.T) { }) sc.m.Get("/", sc.defaultHandler) - sc.fakeReq("GET", "/?org-id=3").exec() + sc.fakeReq("GET", "/?orgId=3").exec() Convey("not allowed to change org", func() { So(sc.resp.Code, ShouldEqual, 404) diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go index 3bd2f54f509..e92edd2af12 100644 --- a/pkg/services/alerting/eval_context.go +++ b/pkg/services/alerting/eval_context.go @@ -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&org-id=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId) + ruleUrl := fmt.Sprintf("%sdashboard/db/%s?fullscreen&edit&tab=alert&panelId=%d&orgId=%d", setting.AppUrl, slug, c.Rule.PanelId, c.Rule.OrgId) return ruleUrl, nil } }