From f2ad3242be223f38500afff30638c3d698e42cc1 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Thu, 11 Jul 2019 09:45:29 +0300 Subject: [PATCH] API: Minor fix for nil pointer when trying to log error during creating new dashboard via the API (#18003) * Minor fix for nil pointer when trying to log error * Do not return error if a dashboard is created Only log the failures * Do not return error if the folder is created Only log the failures --- pkg/api/dashboard.go | 3 +-- pkg/api/folder.go | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 27f70d4d388..a95ef813bfb 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -278,8 +278,7 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand) inFolder := cmd.FolderId > 0 err := dashboards.MakeUserAdmin(hs.Bus, cmd.OrgId, cmd.UserId, dashboard.Id, !inFolder) if err != nil { - 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) + hs.log.Error("Could not make user admin", "dashboard", dashboard.Title, "user", c.SignedInUser.UserId, "error", err) } } diff --git a/pkg/api/folder.go b/pkg/api/folder.go index 802cb71c403..bf55aeee30f 100644 --- a/pkg/api/folder.go +++ b/pkg/api/folder.go @@ -64,7 +64,6 @@ func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) R if hs.Cfg.EditorsCanAdmin { if err := dashboards.MakeUserAdmin(hs.Bus, c.OrgId, c.SignedInUser.UserId, cmd.Result.Id, true); 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) } }