diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Filter/DataTypeFilterControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Filter/DataTypeFilterControllerBase.cs index 653965e7ae..8adf9e2a8a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Filter/DataTypeFilterControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Filter/DataTypeFilterControllerBase.cs @@ -10,7 +10,7 @@ namespace Umbraco.Cms.Api.Management.Controllers.DataType.Filter; [ApiExplorerSettings(GroupName = "Data Type")] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Filter}/{Constants.UdiEntityType.DataType}")] // This auth policy might become problematic, as when getting DataTypes on Media types, you don't need access to the document tree. -[Authorize(Policy = "New" + AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)] +[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)] public abstract class DataTypeFilterControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Core/Constants-DataTypes.cs b/src/Umbraco.Core/Constants-DataTypes.cs index a3e2dbc4c5..d25a34e166 100644 --- a/src/Umbraco.Core/Constants-DataTypes.cs +++ b/src/Umbraco.Core/Constants-DataTypes.cs @@ -54,16 +54,6 @@ public static partial class Constants /// public const string MemberPicker = "1EA2E01F-EBD8-4CE1-8D71-6B1149E63548"; - /// - /// Guid for Media Picker as string - /// - public const string MediaPicker = "135D60E0-64D9-49ED-AB08-893C9BA44AE5"; - - /// - /// Guid for Multiple Media Picker as string - /// - public const string MultipleMediaPicker = "9DBBCBBB-2327-434A-B355-AF1B84E5010A"; - /// /// Guid for Media Picker v3 as string /// @@ -244,16 +234,6 @@ public static partial class Constants /// public static readonly Guid MemberPickerGuid = new(MemberPicker); - /// - /// Guid for Media Picker - /// - public static readonly Guid MediaPickerGuid = new(MediaPicker); - - /// - /// Guid for Multiple Media Picker - /// - public static readonly Guid MultipleMediaPickerGuid = new(MultipleMediaPicker); - /// /// Guid for Media Picker v3 /// diff --git a/src/Umbraco.Core/Models/DataTypeExtensions.cs b/src/Umbraco.Core/Models/DataTypeExtensions.cs index 5dd314f241..568dede982 100644 --- a/src/Umbraco.Core/Models/DataTypeExtensions.cs +++ b/src/Umbraco.Core/Models/DataTypeExtensions.cs @@ -12,8 +12,6 @@ public static class DataTypeExtensions { Constants.DataTypes.Guids.ContentPickerGuid, Constants.DataTypes.Guids.MemberPickerGuid, - Constants.DataTypes.Guids.MediaPickerGuid, - Constants.DataTypes.Guids.MultipleMediaPickerGuid, Constants.DataTypes.Guids.RelatedLinksGuid, Constants.DataTypes.Guids.MemberGuid, Constants.DataTypes.Guids.ImageCropperGuid, diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs index 6cea5550d2..c2efc6d3c2 100644 --- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs @@ -771,44 +771,7 @@ internal class DatabaseDataCreator }, Constants.DatabaseSchema.Tables.Node, "id"); - ConditionalInsert( - Constants.Configuration.NamedOptions.InstallDefaultData.DataTypes, - Constants.DataTypes.Guids.MediaPicker, - new NodeDto - { - NodeId = 1048, - Trashed = false, - ParentId = -1, - UserId = -1, - Level = 1, - Path = "-1,1048", - SortOrder = 2, - UniqueId = Constants.DataTypes.Guids.MediaPickerGuid, - Text = "Media Picker (legacy)", - NodeObjectType = Constants.ObjectTypes.DataType, - CreateDate = DateTime.Now, - }, - Constants.DatabaseSchema.Tables.Node, - "id"); - ConditionalInsert( - Constants.Configuration.NamedOptions.InstallDefaultData.DataTypes, - Constants.DataTypes.Guids.MultipleMediaPicker, - new NodeDto - { - NodeId = 1049, - Trashed = false, - ParentId = -1, - UserId = -1, - Level = 1, - Path = "-1,1049", - SortOrder = 2, - UniqueId = Constants.DataTypes.Guids.MultipleMediaPickerGuid, - Text = "Multiple Media Picker (legacy)", - NodeObjectType = Constants.ObjectTypes.DataType, - CreateDate = DateTime.Now, - }, - Constants.DatabaseSchema.Tables.Node, - "id"); + ConditionalInsert( Constants.Configuration.NamedOptions.InstallDefaultData.DataTypes, Constants.DataTypes.Guids.RelatedLinks,