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

Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent

Browse Source 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
#	src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
This commit is contained in:
Bjarke Berg
2019-01-11 08:29:29 +01:00
parent 6490f57f70 677311aa49
commit 0330be4e6b
627 changed files with 10531 additions and 10745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Models/IContent.cs
View File

@@ -18,9 +18,9 @@ namespace Umbraco.Core.Models
ContentScheduleCollection ContentSchedule { get; set; }
/// <summary>
/// Gets or sets the template used to render the content.
/// Gets or sets the template id used to render the content.
/// </summary>
ITemplate Template { get; set; }
int? TemplateId { get; set; }
/// <summary>
/// Gets a value indicating whether the content is published.
@@ -45,10 +45,10 @@ namespace Umbraco.Core.Models
bool Blueprint { get; }
/// <summary>
/// Gets the template used to render the published version of the content.
/// Gets the template id used to render the published version of the content.
/// </summary>
/// <remarks>When editing the content, the template can change, but this will not until the content is published.</remarks>
ITemplate PublishTemplate { get; }
int? PublishTemplateId { get; }
/// <summary>
/// Gets the name of the published version of the content.