diff --git a/pkg/services/folder/foldertest/foldertest.go b/pkg/services/folder/foldertest/foldertest.go index b7d7c2f0653..7780e482873 100644 --- a/pkg/services/folder/foldertest/foldertest.go +++ b/pkg/services/folder/foldertest/foldertest.go @@ -65,12 +65,9 @@ func modelsToFolders(m []*models.Folder) []*folder.Folder { UID: f.Uid, Title: f.Title, Description: "", // model.Folder does not have a description - URL: f.Url, Created: f.Created, - CreatedBy: f.CreatedBy, Updated: f.Updated, UpdatedBy: f.UpdatedBy, - HasACL: f.HasACL, } } return ret diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go index 1fdfedbb01f..7549b0f6a70 100644 --- a/pkg/services/folder/model.go +++ b/pkg/services/folder/model.go @@ -17,16 +17,11 @@ type Folder struct { Title string Description string - // TODO: is URL relevant for folders? - URL string - Created time.Time Updated time.Time - // TODO: are these next three relevant for folders? + // TODO: validate if this field is required/relevant to folders. UpdatedBy int64 - CreatedBy int64 - HasACL bool } // NewFolder tales a title and returns a Folder with the Created and Updated