Added check for allow_user_org_create, updated admin docs

This commit is contained in:
Torkel Ödegaard
2015-03-30 10:12:24 +02:00
parent 8982dc5ed3
commit b46f8bad6d
4 changed files with 25 additions and 14 deletions
+6 -1
View File
@@ -5,6 +5,7 @@ import (
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
func GetOrg(c *middleware.Context) {
@@ -29,8 +30,12 @@ func GetOrg(c *middleware.Context) {
}
func CreateOrg(c *middleware.Context, cmd m.CreateOrgCommand) {
cmd.UserId = c.UserId
if !setting.AllowUserOrgCreate && !c.IsGrafanaAdmin {
c.JsonApiErr(401, "Access denied", nil)
return
}
cmd.UserId = c.UserId
if err := bus.Dispatch(&cmd); err != nil {
c.JsonApiErr(500, "Failed to create organization", err)
return