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

Merge branch 'temp8' into temp-editing-all-variants

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
This commit is contained in:
Shannon
2018-07-31 15:56:04 +10:00
parent 18cd9ea1e8 6e36755de5
commit 122c18e6d7
287 changed files with 6773 additions and 22126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/Models/ContentTypeTests.cs
View File

@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Models
//ensure that nothing is marked as dirty
contentType.ResetDirtyProperties(false);
var clone = (ContentType)contentType.Clone("newAlias");
var clone = (ContentType)contentType.DeepCloneWithResetIdentities("newAlias");
Assert.AreEqual("newAlias", clone.Alias);
Assert.AreNotEqual("newAlias", contentType.Alias);