Api: Readonly datasources should not be created via the API (#19006)

* Readonly datasources should not be created via the API * Return correct `ReadOnly` value in GetDataSourceByName

Api: Readonly datasources should not be created via the API (#19006)
* Readonly datasources should not be created via the API * Return correct `ReadOnly` value in GetDataSourceByName
b5f0a5d5 · Sofia Papagiannaki · GitHub · 359404eb · b5f0a5d5 · b5f0a5d5
Commit b5f0a5d5 authored Sep 17, 2019 by Sofia Papagiannaki Committed by GitHub Sep 17, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

pkg/api/datasources.go
+0 -1

pkg/models/datasource.go
+2 -2

No files found.
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -231,7 +231,6 @@ func GetDataSourceByName(c *m.ReqContext) Response {
 	}
 	dtos := convertModelToDtos(query.Result)
-	dtos.ReadOnly = true
 	return JSON(200, &dtos)
 }

--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -144,9 +144,9 @@ type AddDataSourceCommand struct {
 	IsDefault         bool              `json:"isDefault"`
 	JsonData          *simplejson.Json  `json:"jsonData"`
 	SecureJsonData    map[string]string `json:"secureJsonData"`
-	ReadOnly          bool              `json:"readOnly"`
 	OrgId    int64 `json:"-"`
+	ReadOnly bool  `json:"-"`
 	Result *DataSource
 }
@@ -168,10 +168,10 @@ type UpdateDataSourceCommand struct {
 	JsonData          *simplejson.Json  `json:"jsonData"`
 	SecureJsonData    map[string]string `json:"secureJsonData"`
 	Version           int               `json:"version"`
-	ReadOnly          bool              `json:"readOnly"`
 	OrgId    int64 `json:"-"`
 	Id       int64 `json:"-"`
+	ReadOnly bool  `json:"-"`
 	Result *DataSource
 }