opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 08:13:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Restore folder properties (#58743)

Browse Source 
* Chore: Fix folder URL

* Restore more folder properties

* Fixup
This commit is contained in:
Sofia Papagiannaki
2022-11-15 12:58:12 +02:00
committed by GitHub
parent 98dbc637cc
commit 93b4b9154e
2 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/api/folder.go
View File

@ -227,30 +227,28 @@ func (hs *HTTPServer) newToFolderDto(c *models.ReqContext, g guardian.DashboardG
// Finding creator and last updater of the folder // Finding creator and last updater of the folder
updater, creator := anonString, anonString updater, creator := anonString, anonString
/* if folder.CreatedBy > 0 {
if folder.CreatedBy > 0 { creator = hs.getUserLogin(c.Req.Context(), folder.CreatedBy)
creator = hs.getUserLogin(c.Req.Context(), folder.CreatedBy) }
} if folder.UpdatedBy > 0 {
if folder.UpdatedBy > 0 { updater = hs.getUserLogin(c.Req.Context(), folder.UpdatedBy)
updater = hs.getUserLogin(c.Req.Context(), folder.UpdatedBy) }
}
*/
return dtos.Folder{ return dtos.Folder{
Id: folder.ID, Id: folder.ID,
Uid: folder.UID, Uid: folder.UID,
Title: folder.Title, Title: folder.Title,
//Url: folder.Url, Url: folder.Url,
//HasACL: folder.HasACL, HasACL: folder.HasACL,
CanSave: canSave, CanSave: canSave,
CanEdit: canEdit, CanEdit: canEdit,
CanAdmin: canAdmin, CanAdmin: canAdmin,
CanDelete: canDelete, CanDelete: canDelete,
CreatedBy: creator, CreatedBy: creator,
Created: folder.Created, Created: folder.Created,
UpdatedBy: updater, UpdatedBy: updater,
Updated: folder.Updated, Updated: folder.Updated,
//Version: folder.Version, Version: folder.Version,
AccessControl: hs.getAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folder.UID), AccessControl: hs.getAccessControlMetadata(c, c.OrgID, dashboards.ScopeFoldersPrefix, folder.UID),
} }
} }

30
pkg/services/folder/model.go
View File

@ -34,11 +34,11 @@ type Folder struct {
// TODO: validate if this field is required/relevant to folders. // TODO: validate if this field is required/relevant to folders.
// currently there is no such column // currently there is no such column
// Version int Version int
// Url string Url string
// UpdatedBy int64 UpdatedBy int64
// CreatedBy int64 CreatedBy int64
// HasACL bool HasACL bool
} }
type FolderDTO struct { type FolderDTO struct {
@ -142,15 +142,15 @@ func (f *Folder) ToLegacyModel() *models.Folder {
func FromDashboard(dash *models.Dashboard) *Folder { func FromDashboard(dash *models.Dashboard) *Folder {
return &Folder{ return &Folder{
ID: dash.Id, ID: dash.Id,
UID: dash.Uid, UID: dash.Uid,
Title: dash.Title, Title: dash.Title,
//HasACL: dash.HasACL, HasACL: dash.HasACL,
//Url: dash.GetUrl(), Url: models.GetFolderUrl(dash.Uid, dash.Slug),
//Version: dash.Version, Version: dash.Version,
Created: dash.Created, Created: dash.Created,
//CreatedBy: dash.CreatedBy, CreatedBy: dash.CreatedBy,
Updated: dash.Updated, Updated: dash.Updated,
//UpdatedBy: dash.UpdatedBy, UpdatedBy: dash.UpdatedBy,
} }
} }