diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs index 84fd5f1495..8ffc4dc101 100644 --- a/src/Umbraco.Core/Models/ContentBase.cs +++ b/src/Umbraco.Core/Models/ContentBase.cs @@ -81,7 +81,7 @@ namespace Umbraco.Core.Models var val = _parentId.Value; if (val == 0) { - throw new InvalidOperationException("The ParentId cannot be a value of 0. Perhaps the parent object used to instantiate this object has not been persisted to the data store."); + throw new InvalidOperationException("The ParentId cannot have a value of 0. Perhaps the parent object used to instantiate this object has not been persisted to the data store."); } return val; } diff --git a/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs b/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs index 2810c9a4d3..7ae9422a25 100644 --- a/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs +++ b/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs @@ -1,6 +1,6 @@ namespace Umbraco.Core.Models.EntityBase { - internal interface IUmbracoEntity : IEntity + public interface IUmbracoEntity : IAggregateRoot { /// /// Gets or sets the Id of the Parent entity diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs index 48fe6019fb..7f7ae49c96 100644 --- a/src/Umbraco.Core/Models/IContentBase.cs +++ b/src/Umbraco.Core/Models/IContentBase.cs @@ -8,44 +8,13 @@ namespace Umbraco.Core.Models /// Defines the base for a Content object with properties that /// are shared between Content and Media. /// - public interface IContentBase : IAggregateRoot + public interface IContentBase : IUmbracoEntity { - /// - /// Gets or Sets the Id of the Parent for the Content - /// - int ParentId { get; set; } - /// /// Gets or Sets the Name of the Content /// string Name { get; set; } - - /// - /// Gets or Sets the Sort Order of the Content - /// - int SortOrder { get; set; } - - /// - /// Gets or Sets the Level of the Content - /// - int Level { get; set; } - - /// - /// Gets or Sets the Path of the Content - /// - string Path { get; set; } - - /// - /// Id of the user who created the Content - /// - int CreatorId { get; set; } - - /// - /// Boolean indicating whether this Content is Trashed or not. - /// If Content is Trashed it will be located in the Recyclebin. - /// - bool Trashed { get; } - + /// /// Integer Id of the default ContentType /// diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs index bdbdb48e47..db1a86f4e9 100644 --- a/src/Umbraco.Core/Models/IContentTypeBase.cs +++ b/src/Umbraco.Core/Models/IContentTypeBase.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Models /// Defines the base for a ContentType with properties that /// are shared between ContentTypes and MediaTypes. /// - public interface IContentTypeBase : IAggregateRoot + public interface IContentTypeBase : IUmbracoEntity { /// /// Gets or Sets the Alias of the ContentType @@ -20,31 +20,11 @@ namespace Umbraco.Core.Models /// string Name { get; set; } - /// - /// Gets or Sets the Id of Parent of the ContentType - /// - int ParentId { get; set; } - - /// - /// Gets or Sets the Level of the Content - /// - int Level { get; set; } - - /// - /// Gets or Sets the Path of the Content - /// - string Path { get; set; } - /// /// Gets or Sets the Description for the ContentType /// string Description { get; set; } - /// - /// Gets or Sets the Sort Order of the ContentType - /// - int SortOrder { get; set; } - /// /// Gets or Sets the Icon for the ContentType /// @@ -55,11 +35,6 @@ namespace Umbraco.Core.Models /// string Thumbnail { get; set; } - /// - /// Gets or Sets the Id of the User who created the ContentType - /// - int CreatorId { get; set; } - /// /// Gets or Sets a boolean indicating whether this ContentType is allowed at the root /// diff --git a/src/Umbraco.Core/Models/IDataTypeDefinition.cs b/src/Umbraco.Core/Models/IDataTypeDefinition.cs index 12b5f4ddb5..3b1391ae8d 100644 --- a/src/Umbraco.Core/Models/IDataTypeDefinition.cs +++ b/src/Umbraco.Core/Models/IDataTypeDefinition.cs @@ -1,64 +1,23 @@ using System; -using System.Runtime.Serialization; using Umbraco.Core.Models.EntityBase; namespace Umbraco.Core.Models { - public interface IDataTypeDefinition : IAggregateRoot + public interface IDataTypeDefinition : IUmbracoEntity { - /// - /// Gets or sets the Id of the Parent entity - /// - /// Might not be necessary if handled as a relation? - [DataMember] - int ParentId { get; set; } - /// /// Gets or sets the name of the current entity /// - [DataMember] string Name { get; set; } - /// - /// Gets or sets the sort order of the content entity - /// - [DataMember] - int SortOrder { get; set; } - - /// - /// Gets or sets the level of the content entity - /// - [DataMember] - int Level { get; set; } - - /// - /// Gets or sets the path - /// - [DataMember] - string Path { get; set; } - - /// - /// Id of the user who created this entity - /// - [DataMember] - int CreatorId { get; set; } - - /// - /// Boolean indicating whether this entity is Trashed or not. - /// - [DataMember] - bool Trashed { get; } - /// /// Id of the DataType control /// - [DataMember] Guid ControlId { get; } /// /// Gets or Sets the DatabaseType for which the DataType's value is saved as /// - [DataMember] DataTypeDatabaseType DatabaseType { get; set; } } } \ No newline at end of file