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

Merge branch 'preferences' of github.com:grafana/grafana into preferences

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-15 22:15:27 +01:00
parent 9c222a445f 51bde36dee
commit e06756bcab
7 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/api.go
View File

@ -96,7 +96,6 @@ func Register(r *macaron.Macaron) {
r.Delete("/stars/dashboard/:id", wrap(UnstarDashboard))
r.Put("/password", bind(m.ChangeUserPasswordCommand{}), wrap(ChangeUserPassword))
r.Get("/quotas", wrap(GetUserQuotas))
r.Combo("/prefs").Get(GetUserPreferences).Put(bind(m.SavePreferencesCommand{}), wrap(SaveUserPreferences))
})
// users (admin permission required)
@ -161,6 +160,8 @@ func Register(r *macaron.Macaron) {
r.Delete("/:id", wrap(DeleteApiKey))
}, reqOrgAdmin)
r.Combo("/preferences").Get(GetPreferences).Put(bind(m.SavePreferencesCommand{}), wrap(SavePreferences))
// Data sources
r.Group("/datasources", func() {
r.Get("/", GetDataSources)