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

Fix merging groups by name

Browse Source
This commit is contained in:
Ronald Barendse
2021-06-22 16:29:43 +02:00
parent 740de049fd
commit 18e6f8cccc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Models/PropertyGroup.cs
View File

@@ -135,9 +135,9 @@ namespace Umbraco.Core.Models
}
}
public bool Equals(PropertyGroup other) => base.Equals(other) && Name.InvariantEquals(other.Name);
public bool Equals(PropertyGroup other) => base.Equals(other) || (other != null && Name.InvariantEquals(other.Name) && ParentKey == other.ParentKey && Type == other.Type);
public override int GetHashCode() => base.GetHashCode() ^ (Name?.ToLowerInvariant()).GetHashCode();
public override int GetHashCode() => (base.GetHashCode(), Name?.ToLowerInvariant(), ParentKey, Type).GetHashCode();
protected override void PerformDeepClone(object clone)
{

6
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -9362,9 +9362,9 @@
"dev": true
},
"nouislider": {
"version": "14.6.3",
"resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.6.3.tgz",
"integrity": "sha512-/3tAqsWY2JYW9vd7bC14bFRA1P9A+pRHOtKmoMsyfnB0fQcd1UFx2pdY1Ey5wAUzTnXTesmYaEo/ecLVETijIQ=="
"version": "14.6.4",
"resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.6.4.tgz",
"integrity": "sha512-PVCGYl+aC7/nVEbW61ypJWfuW3UCpvctz/luxpt4byxxli1FFyjBX9NIiy4Yak9AaO6a5BkPGfFYMCW4eg3eeQ=="
},
"now-and-later": {
"version": "2.0.1",