opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 19:13:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Dashboard] Revert feature toggle trimdefaults (#34888)

Browse Source 
* Revert "solve comments and retrigger the test"

This reverts commit f08d2d9eca1912f89a535d7231e653ff26987a5c.

* Revert "update api doc"

This reverts commit cc09ceb8535fe54f654355d393d1c7f6809518e1.

* Revert "remove post trim"

This reverts commit 46fe8ed596ada5a047a337088278a4195b05fead.

* Revert "fix typo"

This reverts commit 3b3ceee16ed56d982035016d7a1c795972af6de9.

* Revert "Apply suggestions from code review"

This reverts commit 3b7f3b8e15c9d3f8ed1abb14a4f4013ffdc16d27.

* Revert "update comments"

This reverts commit b9c6260876b02b821ea91f4f2d080efe359d1787.

* Revert "update doc"

This reverts commit 8e4c4d7c93e9a1c58322e4cfca447c3b4dee148b.

* Revert "remove feature toggle + add libraryPaneldefinition"

This reverts commit d01cfcc2edd2cfcd675f658e85ad580ac995eb47.

* fix some typos

* Update public/app/features/dashboard/components/ShareModal/ShareExport.tsx

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Update docs/sources/dashboards/export-import.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* fix comments

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
This commit is contained in:
ying-jeanne
2021-05-29 04:29:30 +08:00
committed by GitHub
parent f16b2c40c1
commit b391e43472
7 changed files with 26 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/dashboard.go
View File

@ -51,9 +51,12 @@ func (hs *HTTPServer) TrimDashboard(c *models.ReqContext, cmd models.TrimDashboa
dash := cmd.Dashboard
meta := cmd.Meta
trimedResult, err := hs.LoadSchemaService.DashboardTrimDefaults(*dash)
if err != nil {
return response.Error(500, "Error while trim default value from dashboard json", err)
trimedResult := *dash
if !hs.LoadSchemaService.IsDisabled() {
trimedResult, err = hs.LoadSchemaService.DashboardTrimDefaults(*dash)
if err != nil {
return response.Error(500, "Error while exporting with default values removed", err)
}
}
dto := dtos.TrimDashboardFullWithMeta{