Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react

peterholmberg · peterholmberg · commit a810bed2f54f · 2018-10-09T16:06:04.000+02:00
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
@@ -196,14 +196,12 @@ type DsPermissionType int
 
 const (
 	DsPermissionQuery DsPermissionType = 1 << iota
-	DsPermissionAdmin
 	DsPermissionNoAccess
 )
 
 func (p DsPermissionType) String() string {
 	names := map[int]string{
 		int(DsPermissionQuery):    "Query",
-		int(DsPermissionAdmin):    "Admin",
 		int(DsPermissionNoAccess): "No Access",
 	}
 	return names[int(p)]

Original file line number	Diff line number	Diff line change
`@@ -196,14 +196,12 @@ type DsPermissionType int`
`196`	`196`
`197`	`197`	`const (`
`198`	`198`	`DsPermissionQuery DsPermissionType = 1 << iota`
`199`		`- DsPermissionAdmin`
`200`	`199`	`DsPermissionNoAccess`
`201`	`200`	`)`
`202`	`201`
`203`	`202`	`func (p DsPermissionType) String() string {`
`204`	`203`	`names := map[int]string{`
`205`	`204`	`int(DsPermissionQuery): "Query",`
`206`		`- int(DsPermissionAdmin): "Admin",`
`207`	`205`	`int(DsPermissionNoAccess): "No Access",`
`208`	`206`	`}`
`209`	`207`	`return names[int(p)]`