Commit 47bf1bd2 by woodsaj

return 404 when quotas not enabled.

parent 852f9bd2
...@@ -4,9 +4,13 @@ import ( ...@@ -4,9 +4,13 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
) )
func GetOrgQuotas(c *middleware.Context) Response { func GetOrgQuotas(c *middleware.Context) Response {
if !setting.Quota.Enabled {
return ApiError(404, "Quotas not enabled", nil)
}
query := m.GetQuotasQuery{OrgId: c.ParamsInt64(":orgId")} query := m.GetQuotasQuery{OrgId: c.ParamsInt64(":orgId")}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
...@@ -18,6 +22,9 @@ func GetOrgQuotas(c *middleware.Context) Response { ...@@ -18,6 +22,9 @@ func GetOrgQuotas(c *middleware.Context) Response {
// allow users to query the quotas of their own org. // allow users to query the quotas of their own org.
func GetQuotas(c *middleware.Context) Response { func GetQuotas(c *middleware.Context) Response {
if !setting.Quota.Enabled {
return ApiError(404, "Quotas not enabled", nil)
}
query := m.GetQuotasQuery{OrgId: c.OrgId} query := m.GetQuotasQuery{OrgId: c.OrgId}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
...@@ -28,6 +35,9 @@ func GetQuotas(c *middleware.Context) Response { ...@@ -28,6 +35,9 @@ func GetQuotas(c *middleware.Context) Response {
} }
func UpdateOrgQuota(c *middleware.Context, cmd m.UpdateQuotaCmd) Response { func UpdateOrgQuota(c *middleware.Context, cmd m.UpdateQuotaCmd) Response {
if !setting.Quota.Enabled {
return ApiError(404, "Quotas not enabled", nil)
}
cmd.OrgId = c.ParamsInt64(":orgId") cmd.OrgId = c.ParamsInt64(":orgId")
cmd.Target = m.QuotaTarget(c.Params(":target")) cmd.Target = m.QuotaTarget(c.Params(":target"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment