IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

dashboards: better error handling

Browse Source
This commit is contained in:
Leonard Gram
2019-03-19 13:57:30 +01:00
parent 89d4db8eb6
commit d593ffe3c1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dashboard.go
+2 -1
View File
@@ -281,7 +281,8 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
aclService := dashboards.NewAclService() aclService := dashboards.NewAclService()
err := aclService.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id) err := aclService.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id)
if err != nil { if err != nil {
hs.log.Error("Could not make user admin", "error", err) hs.log.Error("Could not make user admin", "dashboard", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
return Error(500, "Failed to make user admin of dashboard", err)
} }
} }
pkg/api/folder.go
+4 -1
View File
@@ -63,7 +63,10 @@ func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) R
if hs.Cfg.EditorsCanOwn { if hs.Cfg.EditorsCanOwn {
aclService := dashboards.NewAclService() aclService := dashboards.NewAclService()
aclService.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id) if err := aclService.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id); err != nil {
hs.log.Error("Could not make user admin", "folder", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
return Error(500, "Failed to make user admin of folder", err)
}
} }
g := guardian.New(cmd.Result.Id, c.OrgId, c.SignedInUser) g := guardian.New(cmd.Result.Id, c.OrgId, c.SignedInUser)