IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Deprecate FolderID from DashboardACLInfoDTO (#77652)

Browse Source 
* Chore: Deprecate FolderID from DashboardACLInfoDTO

* chore: regen specs
This commit is contained in:
Kat Yang
2023-11-15 10:29:20 -05:00
committed by GitHub
parent 3a2e96b0db
commit ae326eaed1
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/folder_permission.go
View File

@@ -45,6 +45,7 @@ func (hs *HTTPServer) GetFolderPermissionList(c *contextmodel.ReqContext) respon
continue continue
} }
// nolint:staticcheck
perm.FolderID = folder.ID perm.FolderID = folder.ID
perm.DashboardID = 0 perm.DashboardID = 0

9
pkg/services/dashboards/models.go
View File

@@ -428,10 +428,11 @@ type DashboardACL struct {
func (p DashboardACL) TableName() string { return "dashboard_acl" } func (p DashboardACL) TableName() string { return "dashboard_acl" }
type DashboardACLInfoDTO struct { type DashboardACLInfoDTO struct {
OrgID int64 `json:"-" xorm:"org_id"` OrgID int64 `json:"-" xorm:"org_id"`
DashboardID int64 `json:"dashboardId,omitempty" xorm:"dashboard_id"` DashboardID int64 `json:"dashboardId,omitempty" xorm:"dashboard_id"`
FolderID int64 `json:"folderId,omitempty" xorm:"folder_id"` // Deprecated: use FolderUID instead
FolderUID string `json:"folderUid,omitempty" xorm:"folder_uid"` FolderID int64 `json:"folderId,omitempty" xorm:"folder_id"`
FolderUID string `json:"folderUid,omitempty" xorm:"folder_uid"`
Created time.Time `json:"created"` Created time.Time `json:"created"`
Updated time.Time `json:"updated"` Updated time.Time `json:"updated"`

1
public/api-merged.json
View File

@@ -13111,6 +13111,7 @@
"format": "int64" "format": "int64"
}, },
"folderId": { "folderId": {
"description": "Deprecated: use FolderUID instead",
"type": "integer", "type": "integer",
"format": "int64" "format": "int64"
}, },

1
public/openapi3.json
View File

@@ -4184,6 +4184,7 @@
"type": "integer" "type": "integer"
}, },
"folderId": { "folderId": {
"description": "Deprecated: use FolderUID instead",
"format": "int64", "format": "int64",
"type": "integer" "type": "integer"
}, },