opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 06:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into react-panels-step1

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-10-19 09:15:37 +02:00
parent ae7a1bc139 5c95a01229
commit dddbe62d6c
99 changed files with 1500 additions and 2252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/api/frontendsettings.go
View File

@ -22,7 +22,20 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
return nil, err
}
orgDataSources = query.Result
dsFilterQuery := m.DatasourcesPermissionFilterQuery{
User: c.SignedInUser,
Datasources: query.Result,
}
if err := bus.Dispatch(&dsFilterQuery); err != nil {
if err != bus.ErrHandlerNotFound {
return nil, err
}
orgDataSources = query.Result
} else {
orgDataSources = dsFilterQuery.Result
}
}
datasources := make(map[string]interface{})