IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into readonly_dashboards

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-04-17 16:27:51 +02:00
parent 2fc1558daf 059719104f
commit d7688241c6
13 changed files with 1102 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/dashboards/folder_service_test.go
View File

@@ -32,6 +32,7 @@ func TestFolderService(t *testing.T) {
})
bus.AddHandler("test", func(cmd *models.ValidateDashboardBeforeSaveCommand) error {
cmd.Result = &models.ValidateDashboardBeforeSaveResult{}
return models.ErrDashboardUpdateAccessDenied
})
@@ -92,6 +93,7 @@ func TestFolderService(t *testing.T) {
})
bus.AddHandler("test", func(cmd *models.ValidateDashboardBeforeSaveCommand) error {
cmd.Result = &models.ValidateDashboardBeforeSaveResult{}
return nil
})