mirror of
https://github.com/grafana/grafana.git
synced 2026-08-18 17:15:08 -05:00
datasource as cfg: enable editable ds's
This commit is contained in:
@@ -137,6 +137,7 @@ func TestDatasourceAsConfig(t *testing.T) {
|
||||
So(ds.BasicAuthPassword, ShouldEqual, "basic_auth_password")
|
||||
So(ds.WithCredentials, ShouldBeTrue)
|
||||
So(ds.IsDefault, ShouldBeTrue)
|
||||
So(ds.Editable, ShouldBeTrue)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -15,3 +15,4 @@ datasources:
|
||||
is_default: true
|
||||
json_data: '{"graphiteVersion":"0.9"}'
|
||||
secure_json_fields: ''
|
||||
editable: true
|
||||
|
||||
@@ -26,6 +26,7 @@ type DataSourceFromConfig struct {
|
||||
IsDefault bool `json:"is_default" yaml:"is_default"`
|
||||
JsonData string `json:"json_data" yaml:"json_data"`
|
||||
SecureJsonData map[string]string `json:"secure_json_data" yaml:"secure_json_data"`
|
||||
Editable bool `json:"editable" yaml:"editable"`
|
||||
}
|
||||
|
||||
func createInsertCommand(ds DataSourceFromConfig) *models.AddDataSourceCommand {
|
||||
@@ -50,7 +51,7 @@ func createInsertCommand(ds DataSourceFromConfig) *models.AddDataSourceCommand {
|
||||
IsDefault: ds.IsDefault,
|
||||
JsonData: jsonData,
|
||||
SecureJsonData: ds.SecureJsonData,
|
||||
ReadOnly: true,
|
||||
ReadOnly: !ds.Editable,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,6 +78,6 @@ func createUpdateCommand(ds DataSourceFromConfig, id int64) *models.UpdateDataSo
|
||||
IsDefault: ds.IsDefault,
|
||||
JsonData: jsonData,
|
||||
SecureJsonData: ds.SecureJsonData,
|
||||
ReadOnly: true,
|
||||
ReadOnly: !ds.Editable,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user