yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8/8.17' into v9/feature/merge_v8.17-rc

Browse Source
This commit is contained in:
Ronald Barendse
2021-09-07 12:10:58 +02:00
parent e31dad6552 05d0a29e03
commit ee2da5b8ca
335 changed files with 9119 additions and 2275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
View File

@@ -35,6 +35,14 @@ namespace Umbraco.Cms.Core.Exceptions
/// </value>
public string[] PropertyTypeAliases { get; }
/// <summary>
/// Gets the property group aliases.
/// </summary>
/// <value>
/// The property group aliases.
/// </value>
public string[] PropertyGroupAliases { get; }
/// <summary>
/// Initializes a new instance of the <see cref="InvalidCompositionException" /> class.
/// </summary>
@@ -57,7 +65,29 @@ namespace Umbraco.Cms.Core.Exceptions
/// <param name="addedCompositionAlias">The added composition alias.</param>
/// <param name="propertyTypeAliases">The property type aliases.</param>
public InvalidCompositionException(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliases)
: this(addedCompositionAlias.IsNullOrWhiteSpace()
: this(contentTypeAlias, addedCompositionAlias, propertyTypeAliases, new string[0])
{ }
/// <summary>
/// Initializes a new instance of the <see cref="InvalidCompositionException" /> class.
/// </summary>
/// <param name="contentTypeAlias">The content type alias.</param>
/// <param name="addedCompositionAlias">The added composition alias.</param>
/// <param name="propertyTypeAliases">The property type aliases.</param>
/// <param name="propertyGroupAliases">The property group aliases.</param>
public InvalidCompositionException(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliases, string[] propertyGroupAliases)
: this(FormatMessage(contentTypeAlias, addedCompositionAlias, propertyTypeAliases, propertyGroupAliases))
{
ContentTypeAlias = contentTypeAlias;
AddedCompositionAlias = addedCompositionAlias;
PropertyTypeAliases = propertyTypeAliases;
PropertyGroupAliases = propertyGroupAliases;
}
private static string FormatMessage(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliases, string[] propertyGroupAliases)
{
// TODO Add property group aliases to message
return addedCompositionAlias.IsNullOrWhiteSpace()
? string.Format(
"ContentType with alias '{0}' has an invalid composition " +
"and there was a conflict on the following PropertyTypes: '{1}'. " +
@@ -67,11 +97,7 @@ namespace Umbraco.Cms.Core.Exceptions
"ContentType with alias '{0}' was added as a Composition to ContentType with alias '{1}', " +
"but there was a conflict on the following PropertyTypes: '{2}'. " +
"PropertyTypes must have a unique alias across all Compositions in order to compose a valid ContentType Composition.",
addedCompositionAlias, contentTypeAlias, string.Join(", ", propertyTypeAliases)))
{
ContentTypeAlias = contentTypeAlias;
AddedCompositionAlias = addedCompositionAlias;
PropertyTypeAliases = propertyTypeAliases;
addedCompositionAlias, contentTypeAlias, string.Join(", ", propertyTypeAliases));
}
/// <summary>
@@ -102,6 +128,7 @@ namespace Umbraco.Cms.Core.Exceptions
ContentTypeAlias = info.GetString(nameof(ContentTypeAlias));
AddedCompositionAlias = info.GetString(nameof(AddedCompositionAlias));
PropertyTypeAliases = (string[])info.GetValue(nameof(PropertyTypeAliases), typeof(string[]));
PropertyGroupAliases = (string[])info.GetValue(nameof(PropertyGroupAliases), typeof(string[]));
}
/// <summary>
@@ -120,6 +147,7 @@ namespace Umbraco.Cms.Core.Exceptions
info.AddValue(nameof(ContentTypeAlias), ContentTypeAlias);
info.AddValue(nameof(AddedCompositionAlias), AddedCompositionAlias);
info.AddValue(nameof(PropertyTypeAliases), PropertyTypeAliases);
info.AddValue(nameof(PropertyGroupAliases), PropertyGroupAliases);
base.GetObjectData(info, context);
}