From 3a8854b1b9c3c28823e83aac00eb8d9d428a0ceb Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Thu, 23 Jul 2020 08:15:47 +0200
Subject: [PATCH] API: Recognize dashboard errors when saving a folder (#26499)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 pkg/api/folder.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 93fb8089069..593f1f5a133 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
@@ -127,6 +128,11 @@ func toFolderDto(g guardian.DashboardGuardian, folder *models.Folder) dtos.Folde
 }
 
 func toFolderError(err error) Response {
+	var dashboardErr models.DashboardErr
+	if ok := errors.As(err, &dashboardErr); ok {
+		return Error(dashboardErr.StatusCode, err.Error(), err)
+	}
+
 	if err == models.ErrFolderTitleEmpty ||
 		err == models.ErrFolderSameNameExists ||
 		err == models.ErrFolderWithSameUIDExists ||