Added check for allow_user_org_create, updated admin docs
This commit is contained in:
+6
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user