Commit 525b367a by Torkel Ödegaard

Config.js generation, simple temp solution, first is default datasource

parent a7c816c6
...@@ -22,18 +22,34 @@ type configJsTmplModel struct { ...@@ -22,18 +22,34 @@ type configJsTmplModel struct {
DataSources []*m.DataSource DataSources []*m.DataSource
} }
// TODO: cleanup this ugly code
func renderConfig(data *configJsTmplModel) string { func renderConfig(data *configJsTmplModel) string {
datasources := make(map[string]interface{}) datasources := make(map[string]interface{})
for _, ds := range data.DataSources { for i, ds := range data.DataSources {
url := ds.Url url := ds.Url
if ds.Access == m.DS_ACCESS_PROXY { if ds.Access == m.DS_ACCESS_PROXY {
url = "/api/datasources/proxy/" + strconv.FormatInt(ds.Id, 10) url = "/api/datasources/proxy/" + strconv.FormatInt(ds.Id, 10)
} }
datasources[ds.Name] = map[string]interface{}{ var dsMap = map[string]interface{}{
"type": ds.Type, "type": ds.Type,
"url": url, "url": url,
} }
// temp hack, first is always default
// TODO: implement default ds account setting
if i == 0 {
dsMap["default"] = true
}
datasources[ds.Name] = dsMap
}
// add grafana backend data source
datasources["grafana"] = map[string]interface{}{
"type": "grafana",
"url": "",
"grafanaDB": true,
} }
jsonObj := map[string]interface{}{ jsonObj := map[string]interface{}{
......
...@@ -19,6 +19,7 @@ var ( ...@@ -19,6 +19,7 @@ var (
ErrAccountNotFound = errors.New("Account not found") ErrAccountNotFound = errors.New("Account not found")
) )
// Projection from User -> other account given access to
type OtherAccount struct { type OtherAccount struct {
Id int64 Id int64
Email string Email string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment