Merge remote-tracking branch 'origin/v13/dev' into v14/dev
# Conflicts: # Directory.Build.props # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
This commit is contained in:
@@ -14,6 +14,7 @@ public class ContentVariantDisplay : ITabbedContent<ContentPropertyDisplay>, ICo
|
||||
Tabs = new List<Tab<ContentPropertyDisplay>>();
|
||||
Notifications = new List<BackOfficeNotification>();
|
||||
AllowedActions = Enumerable.Empty<string>();
|
||||
AdditionalPreviewUrls = Enumerable.Empty<NamedUrl>();
|
||||
}
|
||||
|
||||
[DataMember(Name = "allowedActions", IsRequired = true)]
|
||||
@@ -72,6 +73,9 @@ public class ContentVariantDisplay : ITabbedContent<ContentPropertyDisplay>, ICo
|
||||
/// </summary>
|
||||
[DataMember(Name = "tabs")]
|
||||
public IEnumerable<Tab<ContentPropertyDisplay>> Tabs { get; set; }
|
||||
|
||||
[DataMember(Name = "additionalPreviewUrls")]
|
||||
public IEnumerable<NamedUrl> AdditionalPreviewUrls { get; set; }
|
||||
}
|
||||
|
||||
public class ContentVariantScheduleDisplay : ContentVariantDisplay
|
||||
|
||||
13
src/Umbraco.Core/Models/ContentEditing/NamedUrl.cs
Normal file
13
src/Umbraco.Core/Models/ContentEditing/NamedUrl.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Umbraco.Cms.Core.Models.ContentEditing;
|
||||
|
||||
[DataContract(Name = "namedUrl", Namespace = "")]
|
||||
public class NamedUrl
|
||||
{
|
||||
[DataMember(Name = "name")]
|
||||
public required string Name { get; set; }
|
||||
|
||||
[DataMember(Name = "url")]
|
||||
public required string Url { get; set; }
|
||||
}
|
||||
Reference in New Issue
Block a user