Chore: Fix status codes for nested folders (grafana#59087)

zserge · web-flow · commit 7ff41cde9a72 · 2022-11-22T16:06:39.000+02:00
* check for errutil errors first

* a better fix
diff --git a/pkg/api/apierrors/folder.go b/pkg/api/apierrors/folder.go
@@ -40,5 +40,5 @@ func ToFolderErrorResponse(err error) response.Response {
 		return response.JSON(412, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})
 	}
 
-	return response.Error(500, "Folder API error", err)
+	return response.ErrOrFallback(500, "Folder API error", err)
 }

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,5 @@ func ToFolderErrorResponse(err error) response.Response {`
`40`	`40`	`return response.JSON(412, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})`
`41`	`41`	`}`
`42`	`42`
`43`		`- return response.Error(500, "Folder API error", err)`
	`43`	`+ return response.ErrOrFallback(500, "Folder API error", err)`
`44`	`44`	`}`