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

Update parameter order of new AddPropertyGroup overload

Browse Source
This commit is contained in:
Ronald Barendse
2021-09-08 16:24:10 +02:00
parent d4f3a55033
commit 0aa545df75
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/ContentTypeBase.cs
View File

@@ -302,7 +302,7 @@ namespace Umbraco.Core.Models
public abstract bool AddPropertyGroup(string groupName);
/// <inheritdoc />
public abstract bool AddPropertyGroup(string name, string alias);
public abstract bool AddPropertyGroup(string alias, string name);
/// <inheritdoc />
[Obsolete("Use AddPropertyType(propertyType, groupAlias, groupName) instead to explicitly set the alias of the group (note the slighty different parameter order).")]

16
src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
View File

@@ -205,19 +205,19 @@ namespace Umbraco.Core.Models
}
/// <inheritdoc />
[Obsolete("Use AddPropertyGroup(name, alias) instead to explicitly set the alias.")]
[Obsolete("Use AddPropertyGroup(alias, name) instead to explicitly set the alias (note the slighty different parameter order).")]
public override bool AddPropertyGroup(string groupName)
{
return AddAndReturnPropertyGroup(groupName, groupName.ToSafeAlias(true)) != null;
return AddAndReturnPropertyGroup(groupName.ToSafeAlias(true), groupName) != null;
}
/// <inheritdoc />
public override bool AddPropertyGroup(string name, string alias)
public override bool AddPropertyGroup(string alias, string name)
{
return AddAndReturnPropertyGroup(name, alias) != null;
return AddAndReturnPropertyGroup(alias, name) != null;
}
private PropertyGroup AddAndReturnPropertyGroup(string name, string alias)
private PropertyGroup AddAndReturnPropertyGroup(string alias, string name)
{
// Ensure we don't have it already
if (PropertyGroups.Contains(alias))
@@ -226,8 +226,8 @@ namespace Umbraco.Core.Models
// Add new group
var group = new PropertyGroup(SupportsPublishing)
{
Name = name,
Alias = alias
Alias = alias,
Name = name
};
// check if it is inherited - there might be more than 1 but we want the 1st, to
@@ -273,7 +273,7 @@ namespace Umbraco.Core.Models
}
else if (!string.IsNullOrEmpty(groupName))
{
group = AddAndReturnPropertyGroup(groupName, groupAlias);
group = AddAndReturnPropertyGroup(groupAlias, groupName);
if (group == null) return false;
}
else

6
src/Umbraco.Core/Models/IContentTypeBase.cs
View File

@@ -168,21 +168,21 @@ namespace Umbraco.Core.Models
/// <remarks>
/// This method will also check if a group already exists with the same alias.
/// </remarks>
[Obsolete("Use AddPropertyGroup(name, alias) instead to explicitly set the alias.")]
[Obsolete("Use AddPropertyGroup(alias, name) instead to explicitly set the alias (note the slighty different parameter order).")]
bool AddPropertyGroup(string groupName);
/// <summary>
/// Adds a property group with the specified <paramref name="name" /> and <paramref name="alias" />.
/// </summary>
/// <param name="name">Name of the group.</param>
/// <param name="alias">The alias.</param>
/// <param name="name">Name of the group.</param>
/// <returns>
/// Returns <c>true</c> if a property group with specified <paramref name="alias" /> was added; otherwise, <c>false</c>.
/// </returns>
/// <remarks>
/// This method will also check if a group already exists with the same alias.
/// </remarks>
bool AddPropertyGroup(string name, string alias);
bool AddPropertyGroup(string alias, string name);
/// <summary>
/// Moves a PropertyType to a specified PropertyGroup