diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs index 836f1fa135..9b0cd19e00 100644 --- a/src/Umbraco.Core/Constants-ObjectTypes.cs +++ b/src/Umbraco.Core/Constants-ObjectTypes.cs @@ -5,243 +5,133 @@ namespace Umbraco.Core public static partial class Constants { /// - /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management. + /// Defines the Umbraco object type unique identifiers. /// public static class ObjectTypes { /// - /// Guid for a data type container + /// Defines the Umbraco object type unique identifiers as string. /// - public const string DataTypeContainer = "521231E3-8B37-469C-9F9D-51AFC91FEB7B"; + /// Should be used only when it's not possible to use the corresponding + /// readonly Guid value, e.g. in attributes (where only consts can be used). + public static class Strings + { + // ReSharper disable MemberHidesStaticFromOuterClass - /// - /// Guid for a data type container - /// - public static readonly Guid DataTypeContainerGuid = new Guid(DataTypeContainer); + public const string DataTypeContainer = "521231E3-8B37-469C-9F9D-51AFC91FEB7B"; - /// - /// Guid for a doc type container - /// - public const string DocumentTypeContainer = "2F7A2769-6B0B-4468-90DD-AF42D64F7F16"; + public const string DocumentTypeContainer = "2F7A2769-6B0B-4468-90DD-AF42D64F7F16"; - /// - /// Guid for a doc type container - /// - public static readonly Guid DocumentTypeContainerGuid = new Guid(DocumentTypeContainer); + public const string MediaTypeContainer = "42AEF799-B288-4744-9B10-BE144B73CDC4"; - /// - /// Guid for a doc type container - /// - public const string MediaTypeContainer = "42AEF799-B288-4744-9B10-BE144B73CDC4"; + public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A"; - /// - /// Guid for a doc type container - /// - public static readonly Guid MediaTypeContainerGuid = new Guid(MediaTypeContainer); + public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532"; - /// - /// Guid for a Content Item object. - /// - public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A"; + public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8"; - /// - /// Guid for a Content Item Type object. - /// - public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532"; + public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C"; - /// - /// Guid for the Content Recycle Bin. - /// - public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8"; + public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972"; - /// - /// Guid for a DataType object. - /// - public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C"; + public const string DocumentBlueprint = "6EBEF410-03AA-48CF-A792-E1C1CB087ACA"; - /// - /// Guid for a DataType object. - /// - public static readonly Guid DataTypeGuid = new Guid(DataType); + public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB"; - /// - /// Guid for a Document object. - /// - public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972"; - - /// - /// Guid for a Document object. - /// - public static readonly Guid DocumentGuid = new Guid(Document); + public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C"; - /// - /// Guid for a Document Blueprint object. - /// - public const string DocumentBlueprint = "6EBEF410-03AA-48CF-A792-E1C1CB087ACA"; + public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113"; - /// - /// Guid for a Document object. - /// - public static readonly Guid DocumentBlueprintGuid = new Guid(DocumentBlueprint); + public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E"; - /// - /// Guid for a Document Type object. - /// - public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB"; + public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560"; - /// - /// Guid for a Document Type object. - /// - public static readonly Guid DocumentTypeGuid = new Guid(DocumentType); + public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728"; - /// - /// Guid for a Media object. - /// - public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C"; + public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43"; - /// - /// Guid for a Media object. - /// - public static readonly Guid MediaGuid = new Guid(Media); + public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D"; - /// - /// Guid for the Media Recycle Bin. - /// - public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113"; + public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D"; - /// - /// Guid for a Media Type object. - /// - public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E"; + public const string LockObject = "87A9F1FF-B1E4-4A25-BABB-465A4A47EC41"; - /// - /// Guid for a Media Type object. - /// - public static readonly Guid MediaTypeGuid = new Guid(MediaType); + public const string RelationType = "B1988FAD-8675-4F47-915A-B3A602BC5D8D"; - /// - /// Guid for a Member object. - /// - public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560"; + public const string FormsForm = "F5A9F787-6593-46F0-B8FF-BFD9BCA9F6BB"; - /// - /// Guid for a Member object. - /// - public static readonly Guid MemberGuid = new Guid(Member); + public const string FormsPreValue = "42D7BF9B-A362-4FEE-B45A-674D5C064B70"; - /// - /// Guid for a Member Group object. - /// - public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728"; + public const string FormsDataSource = "CFED6CE4-9359-443E-9977-9956FEB1D867"; - /// - /// Guid for a Member Group object. - /// - public static readonly Guid MemberGroupGuid = new Guid(MemberGroup); + public const string Language = "6B05D05B-EC78-49BE-A4E4-79E274F07A77"; - /// - /// Guid for a Member Type object. - /// - public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43"; + public const string IdReservation = "92849B1E-3904-4713-9356-F646F87C25F4"; - /// - /// Guid for a Member Type object. - /// - public static readonly Guid MemberTypeGuid = new Guid(MemberType); + [Obsolete("This no longer exists in the database")] + internal const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840"; - /// - /// Guid for a Stylesheet object. - /// - [Obsolete("This no longer exists in the database")] - public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840"; + [Obsolete("This no longer exists in the database")] + internal const string StylesheetProperty = "5555da4f-a123-42b2-4488-dcdfb25e4111"; + + // ReSharper restore MemberHidesStaticFromOuterClass + } + + public static readonly Guid SystemRoot = new Guid(Strings.SystemRoot); + + public static readonly Guid ContentRecycleBin = new Guid(Strings.ContentRecycleBin); + + public static readonly Guid MediaRecycleBin = new Guid(Strings.MediaRecycleBin); + + public static readonly Guid DataTypeContainer = new Guid(Strings.DataTypeContainer); + + public static readonly Guid DocumentTypeContainer = new Guid(Strings.DocumentTypeContainer); + + public static readonly Guid MediaTypeContainer = new Guid(Strings.MediaTypeContainer); + + public static readonly Guid DataType = new Guid(Strings.DataType); + + public static readonly Guid Document = new Guid(Strings.Document); + + public static readonly Guid DocumentBlueprint = new Guid(Strings.DocumentBlueprint); + + public static readonly Guid DocumentType = new Guid(Strings.DocumentType); + + public static readonly Guid Media = new Guid(Strings.Media); + + public static readonly Guid MediaType = new Guid(Strings.MediaType); + + public static readonly Guid Member = new Guid(Strings.Member); + + public static readonly Guid MemberGroup = new Guid(Strings.MemberGroup); + + public static readonly Guid MemberType = new Guid(Strings.MemberType); + + public static readonly Guid TemplateType = new Guid(Strings.Template); + + public static readonly Guid LockObject = new Guid(Strings.LockObject); + + public static readonly Guid RelationType = new Guid(Strings.RelationType); + + public static readonly Guid FormsForm = new Guid(Strings.FormsForm); + + public static readonly Guid FormsPreValue = new Guid(Strings.FormsPreValue); + + public static readonly Guid FormsDataSource = new Guid(Strings.FormsDataSource); + + public static readonly Guid Language = new Guid(Strings.Language); + + public static readonly Guid IdReservation = new Guid(Strings.IdReservation); + + public static readonly Guid Template = new Guid(Strings.Template); + + public static readonly Guid ContentItem = new Guid(Strings.ContentItem); [Obsolete("This no longer exists in the database")] - internal const string StylesheetProperty = "5555da4f-a123-42b2-4488-dcdfb25e4111"; + internal static readonly Guid Stylesheet = new Guid(Strings.Stylesheet); - /// - /// Guid for the System Root. - /// - public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D"; - - /// - /// Guid for a Template object. - /// - public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D"; - - /// - /// Guid for a Template object. - /// - public static readonly Guid TemplateTypeGuid = new Guid(Template); - - /// - /// Guid for a Lock object. - /// - public const string LockObject = "87A9F1FF-B1E4-4A25-BABB-465A4A47EC41"; - - /// - /// Guid for a Lock object. - /// - public static readonly Guid LockObjectGuid = new Guid(LockObject); - - /// - /// Guid for a relation type. - /// - public const string RelationType = "B1988FAD-8675-4F47-915A-B3A602BC5D8D"; - - /// - /// Guid for a relation type. - /// - public static readonly Guid RelationTypeGuid = new Guid(RelationType); - - /// - /// Guid for a Forms Form. - /// - public const string FormsForm = "F5A9F787-6593-46F0-B8FF-BFD9BCA9F6BB"; - - /// - /// Guid for a Forms Form. - /// - public static readonly Guid FormsFormGuid = new Guid(FormsForm); - - /// - /// Guid for a Forms PreValue Source. - /// - public const string FormsPreValue = "42D7BF9B-A362-4FEE-B45A-674D5C064B70"; - - /// - /// Guid for a Forms PreValue Source. - /// - public static readonly Guid FormsPreValueGuid = new Guid(FormsPreValue); - - /// - /// Guid for a Forms DataSource. - /// - public const string FormsDataSource = "CFED6CE4-9359-443E-9977-9956FEB1D867"; - - /// - /// Guid for a Forms DataSource. - /// - public static readonly Guid FormsDataSourceGuid = new Guid(FormsDataSource); - - /// - /// Guid for a Language. - /// - public const string Language = "6B05D05B-EC78-49BE-A4E4-79E274F07A77"; - - /// - /// Guid for a Forms DataSource. - /// - public static readonly Guid LanguageGuid = new Guid(Language); - - /// - /// Guid for an Identifier Reservation. - /// - public const string IdReservation = "92849B1E-3904-4713-9356-F646F87C25F4"; - - /// - /// Guid for an Identifier Reservation. - /// - public static readonly Guid IdReservationGuid = new Guid(IdReservation); + [Obsolete("This no longer exists in the database")] + internal static readonly Guid StylesheetProperty = new Guid(Strings.StylesheetProperty); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Events/RecycleBinEventArgs.cs b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs index fa3bd269fa..9dd82922e1 100644 --- a/src/Umbraco.Core/Events/RecycleBinEventArgs.cs +++ b/src/Umbraco.Core/Events/RecycleBinEventArgs.cs @@ -131,18 +131,12 @@ namespace Umbraco.Core.Events /// /// Boolean indicating whether this event was fired for the Content's Recycle Bin. /// - public bool IsContentRecycleBin - { - get { return NodeObjectType == new Guid(Constants.ObjectTypes.Document); } - } + public bool IsContentRecycleBin => NodeObjectType == Constants.ObjectTypes.Document; /// /// Boolean indicating whether this event was fired for the Media's Recycle Bin. /// - public bool IsMediaRecycleBin - { - get { return NodeObjectType == new Guid(Constants.ObjectTypes.Media); } - } + public bool IsMediaRecycleBin => NodeObjectType == Constants.ObjectTypes.Media; public bool Equals(RecycleBinEventArgs other) { diff --git a/src/Umbraco.Core/Models/EntityContainer.cs b/src/Umbraco.Core/Models/EntityContainer.cs index 5683287b0f..1c5514bdc6 100644 --- a/src/Umbraco.Core/Models/EntityContainer.cs +++ b/src/Umbraco.Core/Models/EntityContainer.cs @@ -13,9 +13,9 @@ namespace Umbraco.Core.Models private static readonly Dictionary ObjectTypeMap = new Dictionary { - { Constants.ObjectTypes.DataTypeGuid, Constants.ObjectTypes.DataTypeContainerGuid }, - { Constants.ObjectTypes.DocumentTypeGuid, Constants.ObjectTypes.DocumentTypeContainerGuid }, - { Constants.ObjectTypes.MediaTypeGuid, Constants.ObjectTypes.MediaTypeContainerGuid } + { Constants.ObjectTypes.DataType, Constants.ObjectTypes.DataTypeContainer }, + { Constants.ObjectTypes.DocumentType, Constants.ObjectTypes.DocumentTypeContainer }, + { Constants.ObjectTypes.MediaType, Constants.ObjectTypes.MediaTypeContainer } }; /// diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs index f73738609c..ba5fe2f1f0 100644 --- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs +++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs @@ -17,7 +17,7 @@ namespace Umbraco.Core.Models /// /// Content Item Type /// - [UmbracoObjectType(Constants.ObjectTypes.ContentItemType)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.ContentItemType)] [FriendlyName("Content Item Type")] [Obsolete("This is not used and will be removed in future versions")] [EditorBrowsable(EditorBrowsableState.Never)] @@ -26,14 +26,14 @@ namespace Umbraco.Core.Models /// /// Root /// - [UmbracoObjectType(Constants.ObjectTypes.SystemRoot)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.SystemRoot)] [FriendlyName("Root")] ROOT, /// /// Document /// - [UmbracoObjectType(Constants.ObjectTypes.Document, typeof(IContent))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.Document, typeof(IContent))] [FriendlyName("Document")] [UmbracoUdiType(Constants.UdiEntityType.Document)] Document, @@ -41,7 +41,7 @@ namespace Umbraco.Core.Models /// /// Media /// - [UmbracoObjectType(Constants.ObjectTypes.Media, typeof(IMedia))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.Media, typeof(IMedia))] [FriendlyName("Media")] [UmbracoUdiType(Constants.UdiEntityType.Media)] Media, @@ -49,7 +49,7 @@ namespace Umbraco.Core.Models /// /// Member Type /// - [UmbracoObjectType(Constants.ObjectTypes.MemberType, typeof(IMemberType))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.MemberType, typeof(IMemberType))] [FriendlyName("Member Type")] [UmbracoUdiType(Constants.UdiEntityType.MemberType)] MemberType, @@ -57,7 +57,7 @@ namespace Umbraco.Core.Models /// /// Template /// - [UmbracoObjectType(Constants.ObjectTypes.Template, typeof(ITemplate))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.Template, typeof(ITemplate))] [FriendlyName("Template")] [UmbracoUdiType(Constants.UdiEntityType.Template)] Template, @@ -65,7 +65,7 @@ namespace Umbraco.Core.Models /// /// Member Group /// - [UmbracoObjectType(Constants.ObjectTypes.MemberGroup)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.MemberGroup)] [FriendlyName("Member Group")] [UmbracoUdiType(Constants.UdiEntityType.MemberGroup)] MemberGroup, @@ -74,7 +74,7 @@ namespace Umbraco.Core.Models /// /// Content Item /// - [UmbracoObjectType(Constants.ObjectTypes.ContentItem)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.ContentItem)] [FriendlyName("Content Item")] [Obsolete("This is not used and will be removed in future versions")] [EditorBrowsable(EditorBrowsableState.Never)] @@ -83,7 +83,7 @@ namespace Umbraco.Core.Models /// /// "Media Type /// - [UmbracoObjectType(Constants.ObjectTypes.MediaType, typeof(IMediaType))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.MediaType, typeof(IMediaType))] [FriendlyName("Media Type")] [UmbracoUdiType(Constants.UdiEntityType.MediaType)] MediaType, @@ -91,7 +91,7 @@ namespace Umbraco.Core.Models /// /// Document Type /// - [UmbracoObjectType(Constants.ObjectTypes.DocumentType, typeof(IContentType))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.DocumentType, typeof(IContentType))] [FriendlyName("Document Type")] [UmbracoUdiType(Constants.UdiEntityType.DocumentType)] DocumentType, @@ -99,14 +99,14 @@ namespace Umbraco.Core.Models /// /// Recycle Bin /// - [UmbracoObjectType(Constants.ObjectTypes.ContentRecycleBin)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.ContentRecycleBin)] [FriendlyName("Recycle Bin")] RecycleBin, /// /// Stylesheet /// - [UmbracoObjectType(Constants.ObjectTypes.Stylesheet)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.Stylesheet)] [FriendlyName("Stylesheet")] [UmbracoUdiType(Constants.UdiEntityType.Stylesheet)] Stylesheet, @@ -114,7 +114,7 @@ namespace Umbraco.Core.Models /// /// Member /// - [UmbracoObjectType(Constants.ObjectTypes.Member, typeof(IMember))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.Member, typeof(IMember))] [FriendlyName("Member")] [UmbracoUdiType(Constants.UdiEntityType.Member)] Member, @@ -122,7 +122,7 @@ namespace Umbraco.Core.Models /// /// Data Type /// - [UmbracoObjectType(Constants.ObjectTypes.DataType, typeof(IDataTypeDefinition))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.DataType, typeof(IDataTypeDefinition))] [FriendlyName("Data Type")] [UmbracoUdiType(Constants.UdiEntityType.DataType)] DataType, @@ -130,7 +130,7 @@ namespace Umbraco.Core.Models /// /// Document type container /// - [UmbracoObjectType(Constants.ObjectTypes.DocumentTypeContainer)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.DocumentTypeContainer)] [FriendlyName("Document Type Container")] [UmbracoUdiType(Constants.UdiEntityType.DocumentTypeContainer)] DocumentTypeContainer, @@ -138,7 +138,7 @@ namespace Umbraco.Core.Models /// /// Media type container /// - [UmbracoObjectType(Constants.ObjectTypes.MediaTypeContainer)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.MediaTypeContainer)] [FriendlyName("Media Type Container")] [UmbracoUdiType(Constants.UdiEntityType.MediaTypeContainer)] MediaTypeContainer, @@ -146,7 +146,7 @@ namespace Umbraco.Core.Models /// /// Media type container /// - [UmbracoObjectType(Constants.ObjectTypes.DataTypeContainer)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.DataTypeContainer)] [FriendlyName("Data Type Container")] [UmbracoUdiType(Constants.UdiEntityType.DataTypeContainer)] DataTypeContainer, @@ -154,7 +154,7 @@ namespace Umbraco.Core.Models /// /// Relation type /// - [UmbracoObjectType(Constants.ObjectTypes.RelationType)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.RelationType)] [FriendlyName("Relation Type")] [UmbracoUdiType(Constants.UdiEntityType.RelationType)] RelationType, @@ -162,35 +162,35 @@ namespace Umbraco.Core.Models /// /// Forms Form /// - [UmbracoObjectType(Constants.ObjectTypes.FormsForm)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.FormsForm)] [FriendlyName("Form")] FormsForm, /// /// Forms PreValue /// - [UmbracoObjectType(Constants.ObjectTypes.FormsPreValue)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.FormsPreValue)] [FriendlyName("PreValue")] FormsPreValue, /// /// Forms DataSource /// - [UmbracoObjectType(Constants.ObjectTypes.FormsDataSource)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.FormsDataSource)] [FriendlyName("DataSource")] FormsDataSource, /// /// Language /// - [UmbracoObjectType(Constants.ObjectTypes.Language)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.Language)] [FriendlyName("Language")] Language, /// /// Document /// - [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))] + [UmbracoObjectType(Constants.ObjectTypes.Strings.DocumentBlueprint, typeof(IContent))] [FriendlyName("DocumentBlueprint")] [UmbracoUdiType(Constants.UdiEntityType.DocumentBluePrint)] DocumentBlueprint, @@ -198,7 +198,7 @@ namespace Umbraco.Core.Models /// /// Reserved Identifier /// - [UmbracoObjectType(Constants.ObjectTypes.IdReservation)] + [UmbracoObjectType(Constants.ObjectTypes.Strings.IdReservation)] [FriendlyName("Identifier Reservation")] IdReservation diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs index b345285a0f..7bca902672 100644 --- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs @@ -116,11 +116,11 @@ namespace Umbraco.Core.Persistence.Factories { Guid nodeObjectType; if (entity is IContentType) - nodeObjectType = Constants.ObjectTypes.DocumentTypeGuid; + nodeObjectType = Constants.ObjectTypes.DocumentType; else if (entity is IMediaType) - nodeObjectType = Constants.ObjectTypes.MediaTypeGuid; + nodeObjectType = Constants.ObjectTypes.MediaType; else if (entity is IMemberType) - nodeObjectType = Constants.ObjectTypes.MemberTypeGuid; + nodeObjectType = Constants.ObjectTypes.MemberType; else throw new Exception("Invalid entity."); diff --git a/src/Umbraco.Core/Persistence/Factories/MemberGroupFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberGroupFactory.cs index 5f4fe6da84..d921ff57fd 100644 --- a/src/Umbraco.Core/Persistence/Factories/MemberGroupFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MemberGroupFactory.cs @@ -11,7 +11,7 @@ namespace Umbraco.Core.Persistence.Factories public MemberGroupFactory() { - _nodeObjectTypeId = new Guid(Constants.ObjectTypes.MemberGroup); + _nodeObjectTypeId = Constants.ObjectTypes.MemberGroup; } #region Implementation of IEntityFactory diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs index 369a0f7995..f083b46ea6 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs @@ -114,44 +114,44 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateUmbracoNodeData() { - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = new Guid(Constants.ObjectTypes.SystemRoot), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.ContentRecycleBin), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.MediaRecycleBin), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -92, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-92", SortOrder = 35, UniqueId = new Guid("f0bc4bfb-b499-40d6-ba86-058885a5178c"), Text = "Label", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textarea", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = new Guid("0cc0eba1-9960-42c9-bf9b-60e150b429ae"), Text = "Textstring", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = new Guid("ca90c950-0aff-4e72-b976-a30b1ac57dad"), Text = "Richtext editor", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -42, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-42", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = new Guid("bb5f57c9-ce2b-4bb9-b697-4caca783a805"), Text = "Radiobox", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -39, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-39", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1041, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1041", SortOrder = 2, UniqueId = new Guid("b6b73142-b9c1-4bf8-a16d-e1c23320b549"), Text = "Tags", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1043, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1043", SortOrder = 2, UniqueId = new Guid("1df9f033-e6d4-451f-b8d2-e0cbc50a836f"), Text = "Image Cropper", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1044, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1044", SortOrder = 0, UniqueId = new Guid("d59be02f-1df9-4228-aa1e-01917d806cda"), Text = Constants.Conventions.MemberTypes.DefaultAlias, NodeObjectType = new Guid(Constants.ObjectTypes.MemberType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = Constants.ObjectTypes.SystemRoot, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = Constants.ObjectTypes.ContentRecycleBin, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -21, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-21", SortOrder = 0, UniqueId = new Guid("BF7C7CBC-952F-4518-97A2-69E9C7B33842"), Text = "Recycle Bin", NodeObjectType = Constants.ObjectTypes.MediaRecycleBin, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -92, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-92", SortOrder = 35, UniqueId = new Guid("f0bc4bfb-b499-40d6-ba86-058885a5178c"), Text = "Label", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -90, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-90", SortOrder = 34, UniqueId = new Guid("84c6b441-31df-4ffe-b67e-67d5bc3ae65a"), Text = "Upload", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -89, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-89", SortOrder = 33, UniqueId = new Guid("c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3"), Text = "Textarea", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -88, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-88", SortOrder = 32, UniqueId = new Guid("0cc0eba1-9960-42c9-bf9b-60e150b429ae"), Text = "Textstring", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -87, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-87", SortOrder = 4, UniqueId = new Guid("ca90c950-0aff-4e72-b976-a30b1ac57dad"), Text = "Richtext editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -51, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-51", SortOrder = 2, UniqueId = new Guid("2e6d3631-066e-44b8-aec4-96f09099b2b5"), Text = "Numeric", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -49, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-49", SortOrder = 2, UniqueId = new Guid("92897bc6-a5f3-4ffe-ae27-f2e7e33dda49"), Text = "True/false", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -43, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-43", SortOrder = 2, UniqueId = new Guid("fbaf13a8-4036-41f2-93a3-974f678c312a"), Text = "Checkbox list", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -42, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-42", SortOrder = 2, UniqueId = new Guid("0b6a45e7-44ba-430d-9da5-4e46060b9e03"), Text = "Dropdown", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -41, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-41", SortOrder = 2, UniqueId = new Guid("5046194e-4237-453c-a547-15db3a07c4e1"), Text = "Date Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -40, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-40", SortOrder = 2, UniqueId = new Guid("bb5f57c9-ce2b-4bb9-b697-4caca783a805"), Text = "Radiobox", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -39, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-39", SortOrder = 2, UniqueId = new Guid("f38f0ac7-1d27-439c-9f3f-089cd8825a53"), Text = "Dropdown multiple", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -37, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-37", SortOrder = 2, UniqueId = new Guid("0225af17-b302-49cb-9176-b9f35cab9c17"), Text = "Approved Color", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -36, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-36", SortOrder = 2, UniqueId = new Guid("e4d66c0f-b935-4200-81f0-025f7256b89a"), Text = "Date Picker with time", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = Constants.Conventions.MediaTypes.Folder, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1032, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1032", SortOrder = 2, UniqueId = new Guid("cc07b313-0843-4aa8-bbda-871c8da728c8"), Text = Constants.Conventions.MediaTypes.Image, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1033, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1033", SortOrder = 2, UniqueId = new Guid("4c52d8ab-54e6-40cd-999c-7a5f24903e4d"), Text = Constants.Conventions.MediaTypes.File, NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1041, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1041", SortOrder = 2, UniqueId = new Guid("b6b73142-b9c1-4bf8-a16d-e1c23320b549"), Text = "Tags", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1043, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1043", SortOrder = 2, UniqueId = new Guid("1df9f033-e6d4-451f-b8d2-e0cbc50a836f"), Text = "Image Cropper", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1044, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1044", SortOrder = 0, UniqueId = new Guid("d59be02f-1df9-4228-aa1e-01917d806cda"), Text = Constants.Conventions.MemberTypes.DefaultAlias, NodeObjectType = Constants.ObjectTypes.MemberType, CreateDate = DateTime.Now }); //New UDI pickers with newer Ids - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1046, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1046", SortOrder = 2, UniqueId = new Guid("FD1E0DA5-5606-4862-B679-5D0CF3A52A59"), Text = "Content Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1047, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1047", SortOrder = 2, UniqueId = new Guid("1EA2E01F-EBD8-4CE1-8D71-6B1149E63548"), Text = "Member Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = new Guid("135D60E0-64D9-49ED-AB08-893C9BA44AE5"), Text = "Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = new Guid("9DBBCBBB-2327-434A-B355-AF1B84E5010A"), Text = "Multiple Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Related Links", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1046, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1046", SortOrder = 2, UniqueId = new Guid("FD1E0DA5-5606-4862-B679-5D0CF3A52A59"), Text = "Content Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1047, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1047", SortOrder = 2, UniqueId = new Guid("1EA2E01F-EBD8-4CE1-8D71-6B1149E63548"), Text = "Member Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = new Guid("135D60E0-64D9-49ED-AB08-893C9BA44AE5"), Text = "Media Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = new Guid("9DBBCBBB-2327-434A-B355-AF1B84E5010A"), Text = "Multiple Media Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Related Links", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); //TODO: We're not creating these for 7.0 - //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1039, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1039", SortOrder = 2, UniqueId = new Guid("06f349a9-c949-4b6a-8660-59c10451af42"), Text = "Ultimate Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1038, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1038", SortOrder = 2, UniqueId = new Guid("1251c96c-185c-4e9b-93f4-b48205573cbd"), Text = "Simple Editor", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1042, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1042", SortOrder = 2, UniqueId = new Guid("0a452bd5-83f9-4bc3-8403-1286e13fb77e"), Text = "Macro Container", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); + //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1039, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1039", SortOrder = 2, UniqueId = new Guid("06f349a9-c949-4b6a-8660-59c10451af42"), Text = "Ultimate Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1038, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1038", SortOrder = 2, UniqueId = new Guid("1251c96c-185c-4e9b-93f4-b48205573cbd"), Text = "Simple Editor", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + //_database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1042, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1042", SortOrder = 2, UniqueId = new Guid("0a452bd5-83f9-4bc3-8403-1286e13fb77e"), Text = "Macro Container", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); } private void CreateUmbracoLockData() @@ -319,10 +319,10 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateUmbracoRelationTypeData() { - var relationType = new RelationTypeDto { Id = 1, Alias = Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = true, Name = Constants.Conventions.RelationTypes.RelateDocumentOnCopyName }; + var relationType = new RelationTypeDto { Id = 1, Alias = Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, ChildObjectType = Constants.ObjectTypes.Document, ParentObjectType = Constants.ObjectTypes.Document, Dual = true, Name = Constants.Conventions.RelationTypes.RelateDocumentOnCopyName }; relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid(); _database.Insert("umbracoRelationType", "id", false, relationType); - relationType = new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName }; + relationType = new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = Constants.ObjectTypes.Document, ParentObjectType = Constants.ObjectTypes.Document, Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName }; relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid(); _database.Insert("umbracoRelationType", "id", false, relationType); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs index 185093897f..9b2afb52a1 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/RemoveStylesheetDataAndTablesAgain.cs @@ -32,14 +32,14 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZer if (tables.InvariantContains("cmsStylesheetProperty")) { local.Delete.FromTable("cmsStylesheetProperty").AllRows(); - local.Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.StylesheetProperty) }); + local.Delete.FromTable("umbracoNode").Row(new { nodeObjectType = Constants.ObjectTypes.StylesheetProperty }); local.Delete.Table("cmsStylesheetProperty"); } if (tables.InvariantContains("cmsStylesheet")) { local.Delete.FromTable("cmsStylesheet").AllRows(); - local.Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.Stylesheet) }); + local.Delete.FromTable("umbracoNode").Row(new { nodeObjectType = Constants.ObjectTypes.Stylesheet }); local.Delete.Table("cmsStylesheet"); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/EnsureContentTypeUniqueIdsAreConsistent.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/EnsureContentTypeUniqueIdsAreConsistent.cs index ad9a88c275..eb0089aa5d 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/EnsureContentTypeUniqueIdsAreConsistent.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/EnsureContentTypeUniqueIdsAreConsistent.cs @@ -23,9 +23,9 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFourZer { var objectTypes = new[] { - Constants.ObjectTypes.DocumentTypeGuid, - Constants.ObjectTypes.MediaTypeGuid, - Constants.ObjectTypes.MemberTypeGuid, + Constants.ObjectTypes.DocumentType, + Constants.ObjectTypes.MediaType, + Constants.ObjectTypes.MemberType }; var sql = Context.Sql() diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs index 10a314cd08..fbe014ebe6 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/NormalizeTemplateGuids.cs @@ -31,7 +31,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero var updates = database.Query(@"SELECT umbracoNode.id, cmsTemplate.alias FROM umbracoNode JOIN cmsTemplate ON umbracoNode.id=cmsTemplate.nodeId -WHERE nodeObjectType = @guid", new { guid = Constants.ObjectTypes.TemplateTypeGuid}) +WHERE nodeObjectType = @guid", new { guid = Constants.ObjectTypes.TemplateType }) .Select(template => Tuple.Create((int) template.id, ("template____" + (string) template.alias).ToGuid())) .ToList(); diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs index 1d02c96fd5..ff6207420c 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs @@ -22,8 +22,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe Insert.IntoTable("umbracoRelationType").Row(new { dual = false, - parentObjectType = Guid.Parse(Constants.ObjectTypes.Document), - childObjectType = Guid.Parse(Constants.ObjectTypes.Document), + parentObjectType = Constants.ObjectTypes.Document, + childObjectType = Constants.ObjectTypes.Document, name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName, alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias }); diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs index ca58e41adf..13b85175a9 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs @@ -49,7 +49,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe sortOrder = 0, uniqueId = new Guid(uniqueId), text = text, - nodeObjectType = Constants.ObjectTypes.LockObjectGuid, + nodeObjectType = Constants.ObjectTypes.LockObject, createDate = DateTime.Now }); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/RemoveStylesheetDataAndTables.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/RemoveStylesheetDataAndTables.cs index baedb6486f..ff0adcde51 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/RemoveStylesheetDataAndTables.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/RemoveStylesheetDataAndTables.cs @@ -19,14 +19,14 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe if (tables.InvariantContains("cmsStylesheetProperty")) { Delete.FromTable("cmsStylesheetProperty").AllRows(); - Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.StylesheetProperty) }); + Delete.FromTable("umbracoNode").Row(new { nodeObjectType = Constants.ObjectTypes.StylesheetProperty }); Delete.Table("cmsStylesheetProperty"); } if (tables.InvariantContains("cmsStylesheet")) { Delete.FromTable("cmsStylesheet").AllRows(); - Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.Stylesheet) }); + Delete.FromTable("umbracoNode").Row(new { nodeObjectType = Constants.ObjectTypes.Stylesheet }); Delete.Table("cmsStylesheet"); } diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs index b2e48da30c..2c70c2474e 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs @@ -24,6 +24,6 @@ namespace Umbraco.Core.Persistence.Repositories EnsureUniqueNaming = false; // duplicates are allowed } - protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentBlueprintGuid; + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentBlueprint; } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index 4fca0c53a1..9835e1a923 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -214,7 +214,7 @@ namespace Umbraco.Core.Persistence.Repositories return list; } - protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentGuid; + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Document; #endregion @@ -349,7 +349,7 @@ namespace Umbraco.Core.Persistence.Repositories // we reach that point - removed. // see if there's a reserved identifier for this unique id - var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservationGuid); + var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservation); var id = Database.ExecuteScalar(sql); if (id > 0) { diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs index 55f7f333d3..b7b99c262d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs @@ -186,7 +186,7 @@ namespace Umbraco.Core.Persistence.Repositories return l; } - protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentTypeGuid; + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentType; /// /// Deletes a content type diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs index ea1b5f476b..693bed8b0f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs @@ -280,7 +280,7 @@ AND umbracoNode.id <> @id", .SelectAll() .From() .InnerJoin().On(left => left.NodeId, right => right.NodeId) - .Where(x => x.NodeObjectType == new Guid(Constants.ObjectTypes.Document)) + .Where(x => x.NodeObjectType == Constants.ObjectTypes.Document) .Where(x => x.ContentTypeId == entity.Id); var contentDtos = Database.Fetch(sql); @@ -776,7 +776,7 @@ AND umbracoNode.id <> @id", WHERE (umbracoNode.nodeObjectType = @nodeObjectType) ORDER BY ctId"; - var result = db.Fetch(sql, new { nodeObjectType = new Guid(Constants.ObjectTypes.MediaType) }); + var result = db.Fetch(sql, new { nodeObjectType = Constants.ObjectTypes.MediaType }); if (result.Any() == false) { @@ -925,7 +925,7 @@ AND umbracoNode.id <> @id", WHERE (umbracoNode.nodeObjectType = @nodeObjectType) ORDER BY ctId"; - var result = db.Fetch(sql, new { nodeObjectType = new Guid(Constants.ObjectTypes.DocumentType)}); + var result = db.Fetch(sql, new { nodeObjectType = Constants.ObjectTypes.DocumentType }); if (result.Any() == false) { diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs index faee76110a..da651d2a30 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Persistence.Repositories class DataTypeContainerRepository : EntityContainerRepository, IDataTypeContainerRepository { public DataTypeContainerRepository(IScopeUnitOfWork uow, CacheHelper cache, ILogger logger) - : base(uow, cache, logger, Constants.ObjectTypes.DataTypeContainerGuid) + : base(uow, cache, logger, Constants.ObjectTypes.DataTypeContainer) { } } } diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs index 541209bbb7..3039304db9 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs @@ -148,10 +148,7 @@ namespace Umbraco.Core.Persistence.Repositories return new List(); } - protected override Guid NodeObjectTypeId - { - get { return new Guid(Constants.ObjectTypes.DataType); } - } + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DataType; #endregion diff --git a/src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs index 91f3f5943b..4110d40548 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Persistence.Repositories class DocumentTypeContainerRepository : EntityContainerRepository, IDocumentTypeContainerRepository { public DocumentTypeContainerRepository(IScopeUnitOfWork uow, CacheHelper cache, ILogger logger) - : base(uow, cache, logger, Constants.ObjectTypes.DocumentTypeContainerGuid) + : base(uow, cache, logger, Constants.ObjectTypes.DocumentTypeContainer) { } } } diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs index fa689f33b6..0e4dade398 100644 --- a/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs @@ -22,7 +22,7 @@ namespace Umbraco.Core.Persistence.Repositories public EntityContainerRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, Guid containerObjectType) : base(work, cache, logger) { - var allowedContainers = new[] {Constants.ObjectTypes.DocumentTypeContainerGuid, Constants.ObjectTypes.MediaTypeContainerGuid, Constants.ObjectTypes.DataTypeContainerGuid}; + var allowedContainers = new[] { Constants.ObjectTypes.DocumentTypeContainer, Constants.ObjectTypes.MediaTypeContainer, Constants.ObjectTypes.DataTypeContainer }; _containerObjectType = containerObjectType; if (allowedContainers.Contains(_containerObjectType) == false) throw new InvalidOperationException("No container type exists with ID: " + _containerObjectType); diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs index 3fbf534077..f08feb682a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs @@ -41,8 +41,8 @@ namespace Umbraco.Core.Persistence.Repositories public IEnumerable GetPagedResultsByQuery(IQuery query, Guid objectTypeId, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection, IQuery filter = null) { - var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid; - var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid; + var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint; + var isMedia = objectTypeId == Constants.ObjectTypes.Media; var factory = new UmbracoEntityFactory(); var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, sql => @@ -171,8 +171,8 @@ namespace Umbraco.Core.Persistence.Repositories public IUmbracoEntity GetByKey(Guid key, Guid objectTypeId) { - var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid; - var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid; + var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint; + var isMedia = objectTypeId == Constants.ObjectTypes.Media; var sql = GetFullSqlForEntityType(key, isContent, isMedia, objectTypeId); @@ -223,8 +223,8 @@ namespace Umbraco.Core.Persistence.Repositories public virtual IUmbracoEntity Get(int id, Guid objectTypeId) { - var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid; - var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid; + var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint; + var isMedia = objectTypeId == Constants.ObjectTypes.Media; var sql = GetFullSqlForEntityType(id, isContent, isMedia, objectTypeId); @@ -267,8 +267,8 @@ namespace Umbraco.Core.Persistence.Repositories private IEnumerable PerformGetAll(Guid objectTypeId, Action filter = null) { - var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid; - var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid; + var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint; + var isMedia = objectTypeId == Constants.ObjectTypes.Media; var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, filter); if (isMedia) @@ -327,8 +327,8 @@ namespace Umbraco.Core.Persistence.Repositories public virtual IEnumerable GetByQuery(IQuery query, Guid objectTypeId) { - var isContent = objectTypeId == Constants.ObjectTypes.DocumentGuid || objectTypeId == Constants.ObjectTypes.DocumentBlueprintGuid; - var isMedia = objectTypeId == Constants.ObjectTypes.MediaGuid; + var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint; + var isMedia = objectTypeId == Constants.ObjectTypes.Media; var sqlClause = GetBaseWhere(GetBase, isContent, isMedia, null, objectTypeId); @@ -417,7 +417,7 @@ namespace Umbraco.Core.Persistence.Repositories : entitySql.Append(GetGroupBy(isContent, false)); } - private Sql GetPropertySql(string nodeObjectType) + private Sql GetPropertySql(Guid nodeObjectType) { var sql = Sql() .Select("contentNodeId, versionId, dataNvarchar, dataNtext, propertyEditorAlias, alias as propertyTypeAlias") diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 1eb06a66ef..652b163447 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -144,7 +144,7 @@ namespace Umbraco.Core.Persistence.Repositories return list; } - protected override Guid NodeObjectTypeId => new Guid(Constants.ObjectTypes.Media); + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Media; #endregion @@ -259,7 +259,7 @@ namespace Umbraco.Core.Persistence.Repositories // we reach that point - removed. // see if there's a reserved identifier for this unique id - var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservationGuid); + var sql = new Sql("SELECT id FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", nodeDto.UniqueId, Constants.ObjectTypes.IdReservation); var id = Database.ExecuteScalar(sql); if (id > 0) { diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs index 5148636edf..e211642d46 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Persistence.Repositories class MediaTypeContainerRepository : EntityContainerRepository, IMediaTypeContainerRepository { public MediaTypeContainerRepository(IScopeUnitOfWork uow, CacheHelper cache, ILogger logger) - : base(uow, cache, logger, Constants.ObjectTypes.MediaTypeContainerGuid) + : base(uow, cache, logger, Constants.ObjectTypes.MediaTypeContainer) { } } } diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs index 94271c2903..ba90911dcc 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs @@ -137,7 +137,7 @@ namespace Umbraco.Core.Persistence.Repositories return l; } - protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MediaTypeGuid; + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MediaType; protected override void PersistNewItem(IMediaType entity) { diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs index cd7a701b4c..1384751a91 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs @@ -88,7 +88,7 @@ namespace Umbraco.Core.Persistence.Repositories return list; } - protected override Guid NodeObjectTypeId => new Guid(Constants.ObjectTypes.MemberGroup); + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberGroup; protected override void PersistNewItem(IMemberGroup entity) { @@ -187,7 +187,7 @@ namespace Umbraco.Core.Persistence.Repositories public void AssignRoles(string[] usernames, string[] roleNames) { //first get the member ids based on the usernames - var memberObjectType = new Guid(Constants.ObjectTypes.Member); + var memberObjectType = Constants.ObjectTypes.Member; var memberSql = Sql() .Select("umbracoNode.id") @@ -204,7 +204,7 @@ namespace Umbraco.Core.Persistence.Repositories public void DissociateRoles(string[] usernames, string[] roleNames) { //first get the member ids based on the usernames - var memberObjectType = new Guid(Constants.ObjectTypes.Member); + var memberObjectType = Constants.ObjectTypes.Member; var memberSql = Sql() .Select("umbracoNode.id") diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index a4beb5d604..fbcdc0b476 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -186,7 +186,7 @@ namespace Umbraco.Core.Persistence.Repositories return list; } - protected override Guid NodeObjectTypeId => new Guid(Constants.ObjectTypes.Member); + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Member; #endregion diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs index d21633f32e..2d175abbf8 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs @@ -192,7 +192,7 @@ namespace Umbraco.Core.Persistence.Repositories return l; } - protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberTypeGuid; + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberType; protected override void PersistNewItem(IMemberType entity) { diff --git a/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs index f881d07346..c4ddab3ac5 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs @@ -516,13 +516,13 @@ namespace Umbraco.Core.Persistence.Repositories switch (type) { case TaggableObjectTypes.Content: - return new Guid(Constants.ObjectTypes.Document); + return Constants.ObjectTypes.Document; case TaggableObjectTypes.Media: - return new Guid(Constants.ObjectTypes.Media); + return Constants.ObjectTypes.Media; case TaggableObjectTypes.Member: - return new Guid(Constants.ObjectTypes.Member); + return Constants.ObjectTypes.Member; default: - throw new ArgumentOutOfRangeException("type"); + throw new ArgumentOutOfRangeException(nameof(type)); } } diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs index 7ba1f1eaa9..d3e9e244c7 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs @@ -142,10 +142,7 @@ namespace Umbraco.Core.Persistence.Repositories return list; } - protected override Guid NodeObjectTypeId - { - get { return new Guid(Constants.ObjectTypes.Template); } - } + protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Template; protected override void PersistNewItem(ITemplate entity) { diff --git a/src/Umbraco.Core/Persistence/UnitOfWorkExtensions.cs b/src/Umbraco.Core/Persistence/UnitOfWorkExtensions.cs index 97d9edd6d9..00a72e993a 100644 --- a/src/Umbraco.Core/Persistence/UnitOfWorkExtensions.cs +++ b/src/Umbraco.Core/Persistence/UnitOfWorkExtensions.cs @@ -22,9 +22,9 @@ namespace Umbraco.Core.Persistence public static IEntityContainerRepository CreateContainerRepository(this IUnitOfWork uow, Guid containerObjectType) { - if (containerObjectType == Constants.ObjectTypes.DocumentTypeContainerGuid) + if (containerObjectType == Constants.ObjectTypes.DocumentTypeContainer) return uow.CreateRepository(); - if (containerObjectType == Constants.ObjectTypes.MediaTypeContainerGuid) + if (containerObjectType == Constants.ObjectTypes.MediaTypeContainer) return uow.CreateRepository(); throw new ArgumentOutOfRangeException(nameof(containerObjectType)); } diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 92b6d76b07..e94e7d98e5 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -702,7 +702,7 @@ namespace Umbraco.Core.Services if (id != Constants.System.Root) { var entityRepository = uow.CreateRepository(); - var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.DocumentGuid, id).ToArray(); + var contentPath = entityRepository.GetAllPaths(Constants.ObjectTypes.Document, id).ToArray(); if (contentPath.Length == 0) { totalChildren = 0; @@ -1673,7 +1673,7 @@ namespace Umbraco.Core.Services /// public void EmptyRecycleBin() { - var nodeObjectType = Constants.ObjectTypes.DocumentGuid; + var nodeObjectType = Constants.ObjectTypes.Document; var deleted = new List(); var evtMsgs = EventMessagesFactory.Get(); // todo - and then? diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs index 29ee4a9fdb..f2631918f1 100644 --- a/src/Umbraco.Core/Services/ContentTypeService.cs +++ b/src/Umbraco.Core/Services/ContentTypeService.cs @@ -26,7 +26,7 @@ namespace Umbraco.Core.Services private IContentService ContentService { get; } - protected override Guid ContainedObjectType => Constants.ObjectTypes.DocumentTypeGuid; + protected override Guid ContainedObjectType => Constants.ObjectTypes.DocumentType; protected override void DeleteItemsOfTypes(IEnumerable typeIds) { diff --git a/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs index 34dd2811d9..d9991393f3 100644 --- a/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs +++ b/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs @@ -763,7 +763,7 @@ namespace Umbraco.Core.Services var repo = uow.CreateContainerRepository(ContainerObjectType); try { - var container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) + var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = name, ParentId = parentId, diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs index 3e6b59448e..2035345961 100644 --- a/src/Umbraco.Core/Services/DataTypeService.cs +++ b/src/Umbraco.Core/Services/DataTypeService.cs @@ -31,7 +31,7 @@ namespace Umbraco.Core.Services var repo = uow.CreateRepository(); try { - var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) + var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = name, ParentId = parentId, @@ -113,9 +113,9 @@ namespace Umbraco.Core.Services { var evtMsgs = EventMessagesFactory.Get(); - if (container.ContainedObjectType != Constants.ObjectTypes.DataTypeGuid) + if (container.ContainedObjectType != Constants.ObjectTypes.DataType) { - var ex = new InvalidOperationException("Not a " + Constants.ObjectTypes.DataTypeGuid + " container."); + var ex = new InvalidOperationException("Not a " + Constants.ObjectTypes.DataType + " container."); return OperationStatus.Attempt.Fail(evtMsgs, ex); } diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs index a5d570b7d6..b2961deb27 100644 --- a/src/Umbraco.Core/Services/EntityService.cs +++ b/src/Umbraco.Core/Services/EntityService.cs @@ -725,14 +725,14 @@ namespace Umbraco.Core.Services NodeDto node; using (var scope = UowProvider.ScopeProvider.CreateScope()) { - var sql = new Sql("SELECT * FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", key, Constants.ObjectTypes.IdReservationGuid); + var sql = new Sql("SELECT * FROM umbracoNode WHERE uniqueID=@0 AND nodeObjectType=@1", key, Constants.ObjectTypes.IdReservation); node = scope.Database.SingleOrDefault(sql); if (node != null) throw new InvalidOperationException("An identifier has already been reserved for this Udi."); node = new NodeDto { UniqueId = key, Text = "RESERVED.ID", - NodeObjectType = Constants.ObjectTypes.IdReservationGuid, + NodeObjectType = Constants.ObjectTypes.IdReservation, CreateDate = DateTime.Now, UserId = 0, diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs index 81125063e4..82899a9639 100644 --- a/src/Umbraco.Core/Services/MediaService.cs +++ b/src/Umbraco.Core/Services/MediaService.cs @@ -634,7 +634,7 @@ namespace Umbraco.Core.Services if (id != Constants.System.Root) { var entityRepository = uow.CreateRepository(); - var mediaPath = entityRepository.GetAllPaths(Constants.ObjectTypes.MediaGuid, id).ToArray(); + var mediaPath = entityRepository.GetAllPaths(Constants.ObjectTypes.Media, id).ToArray(); if (mediaPath.Length == 0) { totalChildren = 0; @@ -1232,7 +1232,7 @@ namespace Umbraco.Core.Services /// public void EmptyRecycleBin() { - var nodeObjectType = new Guid(Constants.ObjectTypes.Media); + var nodeObjectType = Constants.ObjectTypes.Media; var deleted = new List(); var evtMsgs = EventMessagesFactory.Get(); // todo - and then? diff --git a/src/Umbraco.Core/Services/MediaTypeService.cs b/src/Umbraco.Core/Services/MediaTypeService.cs index 76f3fab874..73c701afda 100644 --- a/src/Umbraco.Core/Services/MediaTypeService.cs +++ b/src/Umbraco.Core/Services/MediaTypeService.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Services private IMediaService MediaService { get; } - protected override Guid ContainedObjectType => Constants.ObjectTypes.MediaTypeGuid; + protected override Guid ContainedObjectType => Constants.ObjectTypes.MediaType; protected override void DeleteItemsOfTypes(IEnumerable typeIds) { diff --git a/src/Umbraco.Core/Services/MemberTypeService.cs b/src/Umbraco.Core/Services/MemberTypeService.cs index 569d8845dc..306b714fba 100644 --- a/src/Umbraco.Core/Services/MemberTypeService.cs +++ b/src/Umbraco.Core/Services/MemberTypeService.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Services private IMemberService MemberService { get; } - protected override Guid ContainedObjectType => Constants.ObjectTypes.MemberTypeGuid; + protected override Guid ContainedObjectType => Constants.ObjectTypes.MemberType; protected override void DeleteItemsOfTypes(IEnumerable typeIds) { diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs index f03312402f..8ecc8d1781 100644 --- a/src/Umbraco.Core/Services/NotificationService.cs +++ b/src/Umbraco.Core/Services/NotificationService.cs @@ -74,7 +74,7 @@ namespace Umbraco.Core.Services { // users are returned ordered by id, notifications are returned ordered by user id var users = ((UserService) _userService).GetNextUsers(id, pagesz).Where(x => x.IsApproved).ToList(); - var notifications = GetUsersNotifications(users.Select(x => x.Id), action, nodeIds, Constants.ObjectTypes.DocumentGuid).ToList(); + var notifications = GetUsersNotifications(users.Select(x => x.Id), action, nodeIds, Constants.ObjectTypes.Document).ToList(); if (notifications.Count == 0) break; var i = 0; @@ -157,7 +157,7 @@ namespace Umbraco.Core.Services { // users are returned ordered by id, notifications are returned ordered by user id var users = ((UserService)_userService).GetNextUsers(id, pagesz).Where(x => x.IsApproved).ToList(); - var notifications = GetUsersNotifications(users.Select(x => x.Id), action, Enumerable.Empty(), Constants.ObjectTypes.DocumentGuid).ToList(); + var notifications = GetUsersNotifications(users.Select(x => x.Id), action, Enumerable.Empty(), Constants.ObjectTypes.Document).ToList(); if (notifications.Count == 0) break; var i = 0; diff --git a/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs b/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs index 8290fdeefe..4313109f68 100644 --- a/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs +++ b/src/Umbraco.Core/Strategies/RelateOnCopyComponent.cs @@ -25,8 +25,8 @@ namespace Umbraco.Core.Strategies if (relationType == null) { - relationType = new RelationType(new Guid(Constants.ObjectTypes.Document), - new Guid(Constants.ObjectTypes.Document), + relationType = new RelationType(Constants.ObjectTypes.Document, + Constants.ObjectTypes.Document, Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, Constants.Conventions.RelationTypes.RelateDocumentOnCopyName) { IsBidirectional = true }; diff --git a/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs b/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs index 71049b898e..b0f814c406 100644 --- a/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs +++ b/src/Umbraco.Core/Strategies/RelateOnTrashComponent.cs @@ -42,7 +42,7 @@ namespace Umbraco.Core.Strategies // check that the relation-type exists, if not, then recreate it if (relationType == null) { - var documentObjectType = new Guid(Constants.ObjectTypes.Document); + var documentObjectType = Constants.ObjectTypes.Document; const string relationTypeName = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName; relationType = new RelationType(documentObjectType, documentObjectType, relationTypeAlias, relationTypeName); diff --git a/src/Umbraco.Core/UdiGetterExtensions.cs b/src/Umbraco.Core/UdiGetterExtensions.cs index 66c66955ca..0dca1a0f78 100644 --- a/src/Umbraco.Core/UdiGetterExtensions.cs +++ b/src/Umbraco.Core/UdiGetterExtensions.cs @@ -102,11 +102,11 @@ namespace Umbraco.Core if (entity == null) throw new ArgumentNullException("entity"); string entityType; - if (entity.ContainedObjectType == Constants.ObjectTypes.DataTypeGuid) + if (entity.ContainedObjectType == Constants.ObjectTypes.DataType) entityType = Constants.UdiEntityType.DataTypeContainer; - else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentTypeGuid) + else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentType) entityType = Constants.UdiEntityType.DocumentTypeContainer; - else if (entity.ContainedObjectType == Constants.ObjectTypes.MediaTypeGuid) + else if (entity.ContainedObjectType == Constants.ObjectTypes.MediaType) entityType = Constants.UdiEntityType.MediaTypeContainer; else throw new NotSupportedException(string.Format("Contained object type {0} is not supported.", entity.ContainedObjectType)); diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs index 671d82fae9..418349d52c 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectType = new Guid(Constants.ObjectTypes.Document); + var NodeObjectType = Constants.ObjectTypes.Document; var expected = new Sql(); expected.Select("*") @@ -50,7 +50,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Where_Clause() { - var NodeObjectType = new Guid(Constants.ObjectTypes.Document); + var NodeObjectType = Constants.ObjectTypes.Document; var expected = Sql(); expected.SelectAll() @@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Where_With_Version_Clause() { - var NodeObjectType = new Guid(Constants.ObjectTypes.Document); + var NodeObjectType = Constants.ObjectTypes.Document; var versionId = new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07"); var expected = new Sql(); diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs index f8e674e5ed..c39b607102 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs @@ -16,7 +16,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var nodeObjectType = new Guid(Constants.ObjectTypes.DocumentType); + var nodeObjectType = Constants.ObjectTypes.DocumentType; var expected = Sql(); expected.Select("*") @@ -52,7 +52,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Where_Clause() { - var nodeObjectType = new Guid(Constants.ObjectTypes.DocumentType); + var nodeObjectType = Constants.ObjectTypes.DocumentType; var expected = Sql(); expected.SelectAll() diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs index b6c3a839f8..290edc90d3 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs @@ -26,11 +26,11 @@ namespace Umbraco.Tests.Persistence.Querying using (var scope = ScopeProvider.CreateScope()) { scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55554, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,55554", SortOrder = 1, UniqueId = new Guid("87D1EAB6-AB27-4852-B3DF-DE8DBA4A1AA0"), Text = "Template 1", NodeObjectType = new Guid(Constants.ObjectTypes.Template), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Template 2", NodeObjectType = new Guid(Constants.ObjectTypes.Template), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Content Type 1", NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Content Type 2", NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Content Type 2", NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType), CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55554, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,55554", SortOrder = 1, UniqueId = new Guid("87D1EAB6-AB27-4852-B3DF-DE8DBA4A1AA0"), Text = "Template 1", NodeObjectType = Constants.ObjectTypes.Template, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Template 2", NodeObjectType = Constants.ObjectTypes.Template, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Content Type 1", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Content Type 2", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Content Type 2", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsTemplate")))); @@ -91,9 +91,9 @@ namespace Umbraco.Tests.Persistence.Querying using (var scope = ScopeProvider.CreateScope()) { scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Media Type 1", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Media Type 2", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Media Type 2", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99997, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99997", SortOrder = 0, UniqueId = new Guid("BB3241D5-6842-4EFA-A82A-5F56885CF528"), Text = "Test Media Type 1", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99998, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99998", SortOrder = 0, UniqueId = new Guid("EEA66B06-302E-49BA-A8B2-EDF07248BC59"), Text = "Test Media Type 2", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("C45CC083-BB27-4C1C-B448-6F703CC9B799"), Text = "Test Media Type 2", NodeObjectType = Constants.ObjectTypes.MediaType, CreateDate = DateTime.Now }); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsContentType")))); @@ -143,8 +143,8 @@ namespace Umbraco.Tests.Persistence.Querying using (var scope = ScopeProvider.CreateScope()) { scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("umbracoNode")))); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Test Data Type", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("129241F0-D24E-4FC3-92D1-BC2D48B7C431"), Text = "Test Content Type", NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType), CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 55555, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,55555", SortOrder = 1, UniqueId = new Guid("3390BDF4-C974-4211-AA95-3812A8CE7C46"), Text = "Test Data Type", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + scope.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 99999, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,99999", SortOrder = 0, UniqueId = new Guid("129241F0-D24E-4FC3-92D1-BC2D48B7C431"), Text = "Test Content Type", NodeObjectType = Constants.ObjectTypes.DocumentType, CreateDate = DateTime.Now }); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF ", SqlSyntax.GetQuotedTableName("umbracoNode")))); scope.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", SqlSyntax.GetQuotedTableName("cmsDataType")))); diff --git a/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs index cbca9449c0..748c43bb13 100644 --- a/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectTypeId = new Guid(Constants.ObjectTypes.DataType); + var NodeObjectTypeId = Constants.ObjectTypes.DataType; var expected = new Sql(); expected.Select("*") diff --git a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs index 4b10b67e80..4637a73878 100644 --- a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectTypeId = new Guid(Constants.ObjectTypes.Media); + var NodeObjectTypeId = Constants.ObjectTypes.Media; var expected = new Sql(); expected.Select("*") diff --git a/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs index 97c04f9309..6d5292f343 100644 --- a/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectTypeId = new Guid(Constants.ObjectTypes.MediaType); + var NodeObjectTypeId = Constants.ObjectTypes.MediaType; var expected = new Sql(); expected.Select("*") diff --git a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs index d25d75c016..25142c365e 100644 --- a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs @@ -102,7 +102,7 @@ namespace Umbraco.Tests.Persistence.Querying // Arrange var path = "-1,1046,1076,1089"; var id = 1046; - var nodeObjectTypeId = new Guid(Constants.ObjectTypes.Document); + var nodeObjectTypeId = Constants.ObjectTypes.Document; var sql = Sql(); sql.SelectAll() diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index 23676e2233..d002374b2a 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -103,13 +103,13 @@ namespace Umbraco.Tests.Persistence.Repositories var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { - var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); + var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer); var repository = CreateRepository(unitOfWork); - var container1 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah1" }; + var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah1" }; containerRepository.AddOrUpdate(container1); unitOfWork.Flush(); - var container2 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah2", ParentId = container1.Id }; + var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah2", ParentId = container1.Id }; containerRepository.AddOrUpdate(container2); unitOfWork.Flush(); @@ -149,8 +149,8 @@ namespace Umbraco.Tests.Persistence.Repositories var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { - var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); - var container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah" }; + var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer); + var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); Assert.That(container.Id, Is.GreaterThan(0)); @@ -168,13 +168,13 @@ namespace Umbraco.Tests.Persistence.Repositories var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { - var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); + var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer); - container1 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "container1" }; + container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container1" }; containerRepository.AddOrUpdate(container1); - container2 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "container2" }; + container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container2" }; containerRepository.AddOrUpdate(container2); - container3 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "container3" }; + container3 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container3" }; containerRepository.AddOrUpdate(container3); unitOfWork.Flush(); Assert.That(container1.Id, Is.GreaterThan(0)); @@ -198,8 +198,8 @@ namespace Umbraco.Tests.Persistence.Repositories var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { - var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainerGuid); - var container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid) { Name = "blah" }; + var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer); + var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -218,9 +218,9 @@ namespace Umbraco.Tests.Persistence.Repositories var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { - var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid); + var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainer); var repository = CreateRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -239,9 +239,9 @@ namespace Umbraco.Tests.Persistence.Repositories var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) { - var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainerGuid); + var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainer); var repository = CreateMediaTypeRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -639,7 +639,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = unitOfWork.Database.ExecuteScalar( "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType", - new {NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType)}); + new {NodeObjectType = Constants.ObjectTypes.DocumentType}); // Assert Assert.That(contentTypes.Any(), Is.True); @@ -662,7 +662,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = unitOfWork.Database.ExecuteScalar( "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType", - new { NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType) }); + new { NodeObjectType = Constants.ObjectTypes.DocumentType }); // Assert Assert.That(contentTypes.Any(), Is.True); diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index cb65d57fe4..70066e7b1a 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -63,7 +63,7 @@ namespace Umbraco.Tests.Persistence.Repositories private EntityContainerRepository CreateContainerRepository(IScopeUnitOfWork unitOfWork) { - return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Constants.ObjectTypes.DataTypeContainerGuid); + return new EntityContainerRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Constants.ObjectTypes.DataTypeContainer); } [Test] @@ -74,11 +74,11 @@ namespace Umbraco.Tests.Persistence.Repositories { var containerRepository = CreateContainerRepository(unitOfWork); var repository = CreateRepository(unitOfWork); - var container1 = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah1" }; + var container1 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah1" }; containerRepository.AddOrUpdate(container1); unitOfWork.Flush(); - var container2 = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah2", ParentId = container1.Id }; + var container2 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah2", ParentId = container1.Id }; containerRepository.AddOrUpdate(container2); unitOfWork.Flush(); @@ -120,7 +120,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); Assert.That(container.Id, Is.GreaterThan(0)); @@ -137,7 +137,7 @@ namespace Umbraco.Tests.Persistence.Repositories using (var unitOfWork = provider.CreateUnitOfWork()) { var containerRepository = CreateContainerRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -158,7 +158,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var containerRepository = CreateContainerRepository(unitOfWork); var repository = CreateRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -178,7 +178,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var containerRepository = CreateContainerRepository(unitOfWork); var repository = CreateRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.DataTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index ecd194bc8d..0cbd7637d7 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -23,7 +23,7 @@ namespace Umbraco.Tests.Persistence.Repositories private EntityContainerRepository CreateContainerRepository(IScopeUnitOfWork unitOfWork) { - return new EntityContainerRepository(unitOfWork, DisabledCache, Logger, Constants.ObjectTypes.MediaTypeContainerGuid); + return new EntityContainerRepository(unitOfWork, DisabledCache, Logger, Constants.ObjectTypes.MediaTypeContainer); } @@ -36,11 +36,11 @@ namespace Umbraco.Tests.Persistence.Repositories var containerRepository = CreateContainerRepository(unitOfWork); var repository = CreateRepository(unitOfWork); - var container1 = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah1" }; + var container1 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah1" }; containerRepository.AddOrUpdate(container1); unitOfWork.Flush(); - var container2 = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah2", ParentId = container1.Id }; + var container2 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah2", ParentId = container1.Id }; containerRepository.AddOrUpdate(container2); unitOfWork.Flush(); @@ -82,7 +82,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var containerRepository = CreateContainerRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); Assert.That(container.Id, Is.GreaterThan(0)); @@ -100,7 +100,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var containerRepository = CreateContainerRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); Assert.That(container.Id, Is.GreaterThan(0)); @@ -123,7 +123,7 @@ namespace Umbraco.Tests.Persistence.Repositories var containerRepository = CreateContainerRepository(unitOfWork); var repository = CreateRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Persistence.Repositories var containerRepository = CreateContainerRepository(unitOfWork); var repository = CreateRepository(unitOfWork); - var container = new EntityContainer(Constants.ObjectTypes.MediaTypeGuid) { Name = "blah" }; + var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" }; containerRepository.AddOrUpdate(container); unitOfWork.Flush(); @@ -312,7 +312,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = unitOfWork.Database.ExecuteScalar( "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType", - new {NodeObjectType = new Guid(Constants.ObjectTypes.MediaType)}); + new { NodeObjectType = Constants.ObjectTypes.MediaType }); // Assert Assert.That(mediaTypes.Any(), Is.True); @@ -338,7 +338,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = unitOfWork.Database.ExecuteScalar( "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType", - new { NodeObjectType = new Guid(Constants.ObjectTypes.MediaType) }); + new { NodeObjectType = Constants.ObjectTypes.MediaType }); // Assert Assert.That(mediaTypes.Any(), Is.True); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index 0e36f2e5d1..09957fea76 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -363,9 +363,6 @@ namespace Umbraco.Tests.Persistence.Repositories return sql; } - private Guid NodeObjectTypeId - { - get { return new Guid(Constants.ObjectTypes.Member); } - } + private Guid NodeObjectTypeId => Constants.ObjectTypes.Member; } } diff --git a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs index 37831488fb..2d4d6e0ed0 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs @@ -26,7 +26,7 @@ namespace Umbraco.Tests.Persistence.Repositories { var repo = new NotificationsRepository(unitOfWork); - var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1,123", SortOrder = 1, Text = "hello", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,123", SortOrder = 1, Text = "hello", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; var result = unitOfWork.Database.Insert(node); var entity = Mock.Of(e => e.Id == node.NodeId); var user = Mock.Of(e => e.Id == node.UserId); @@ -57,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Repositories for (var i = 0; i < 10; i++) { - var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1," + i, SortOrder = 1, Text = "hello" + i, Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1," + i, SortOrder = 1, Text = "hello" + i, Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; var result = unitOfWork.Database.Insert(node); var entity = Mock.Of(e => e.Id == node.NodeId); var notification = repo.CreateNotification((i%2 == 0) ? userAdmin : userNew, entity, i.ToString(CultureInfo.InvariantCulture)); @@ -78,10 +78,10 @@ namespace Umbraco.Tests.Persistence.Repositories var repo = new NotificationsRepository(unitOfWork); - var node1 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1,1", SortOrder = 1, Text = "hello1", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node1 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,1", SortOrder = 1, Text = "hello1", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; unitOfWork.Database.Insert(node1); var entity1 = Mock.Of(e => e.Id == node1.NodeId); - var node2 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1,2", SortOrder = 1, Text = "hello2", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node2 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,2", SortOrder = 1, Text = "hello2", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; unitOfWork.Database.Insert(node2); var entity2 = Mock.Of(e => e.Id == node2.NodeId); @@ -108,10 +108,10 @@ namespace Umbraco.Tests.Persistence.Repositories var repo = new NotificationsRepository(unitOfWork); - var node1 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1,1", SortOrder = 1, Text = "hello1", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node1 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,1", SortOrder = 1, Text = "hello1", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; unitOfWork.Database.Insert(node1); var entity1 = Mock.Of(e => e.Id == node1.NodeId); - var node2 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1,2", SortOrder = 1, Text = "hello2", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node2 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,2", SortOrder = 1, Text = "hello2", Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; unitOfWork.Database.Insert(node2); var entity2 = Mock.Of(e => e.Id == node2.NodeId); @@ -146,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories for (var i = 0; i < 10; i++) { - var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Guid.Parse(Constants.ObjectTypes.ContentItem), ParentId = -1, Path = "-1," + i, SortOrder = 1, Text = "hello" + i, Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; + var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1," + i, SortOrder = 1, Text = "hello" + i, Trashed = false, UniqueId = Guid.NewGuid(), UserId = 0 }; var result = unitOfWork.Database.Insert(node); var entity = Mock.Of(e => e.Id == node.NodeId); var notification = repo.CreateNotification((i%2 == 0) ? userAdmin : userNew, entity, i.ToString(CultureInfo.InvariantCulture)); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index a3803b2f63..5d6f54dbff 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -258,8 +258,8 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var relateContent = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; - var relateContentType = new RelationType(new Guid(Constants.ObjectTypes.DocumentType), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; + var relateContent = new RelationType(Constants.ObjectTypes.Document, new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; + var relateContentType = new RelationType(Constants.ObjectTypes.DocumentType, new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs index b9a983105e..eb7a5652c1 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -41,8 +41,8 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = CreateRepository(unitOfWork); // Act - var relateMemberToContent = new RelationType(new Guid(Constants.ObjectTypes.Member), - new Guid(Constants.ObjectTypes.Document), + var relateMemberToContent = new RelationType(Constants.ObjectTypes.Member, + Constants.ObjectTypes.Document, "relateMemberToContent") { IsBidirectional = true, Name = "Relate Member to Content" }; repository.AddOrUpdate(relateMemberToContent); @@ -208,7 +208,7 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = CreateRepository(unitOfWork); // Act - var childObjType = new Guid(Constants.ObjectTypes.DocumentType); + var childObjType = Constants.ObjectTypes.DocumentType; var query = unitOfWork.Query().Where(x => x.ChildObjectType == childObjType); var result = repository.GetByQuery(query); @@ -228,8 +228,8 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var relateContent = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; - var relateContentType = new RelationType(new Guid(Constants.ObjectTypes.DocumentType), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; + var relateContent = new RelationType(Constants.ObjectTypes.Document, new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; + var relateContentType = new RelationType(Constants.ObjectTypes.DocumentType, new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); using (var unitOfWork = provider.CreateUnitOfWork()) diff --git a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs index d75c4c3554..392364924e 100644 --- a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs +++ b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs @@ -24,7 +24,7 @@ namespace Umbraco.Tests.Persistence.SyntaxProvider [Test] public void Can_Generate_Delete_SubQuery_Statement() { - var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media); + var mediaObjectType = Constants.ObjectTypes.Media; var subQuery = Sql() .Select("DISTINCT cmsContentXml.nodeId") .From() diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index e94b010c27..250d506077 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -1692,7 +1692,7 @@ namespace Umbraco.Tests.Services admin.StartContentIds = new[] {content1.Id}; ServiceContext.UserService.Save(admin); - ServiceContext.RelationService.Save(new RelationType(Constants.ObjectTypes.DocumentGuid, Constants.ObjectTypes.DocumentGuid, "test")); + ServiceContext.RelationService.Save(new RelationType(Constants.ObjectTypes.Document, Constants.ObjectTypes.Document, "test")); Assert.IsNotNull(ServiceContext.RelationService.Relate(content1, content2, "test")); ServiceContext.PublicAccessService.Save(new PublicAccessEntry(content1, content2, content2, new List diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs index af7f71a23c..a4ee1f37d2 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs @@ -538,7 +538,7 @@ namespace Umbraco.Tests.Services var cts = ServiceContext.ContentTypeService; // Act - var container = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid); + var container = new EntityContainer(Constants.ObjectTypes.DocumentType); container.Name = "container1"; cts.SaveContainer(container); @@ -554,11 +554,11 @@ namespace Umbraco.Tests.Services var cts = ServiceContext.ContentTypeService; // Act - var container1 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid); + var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType); container1.Name = "container1"; cts.SaveContainer(container1); - var container2 = new EntityContainer(Constants.ObjectTypes.DocumentTypeGuid); + var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType); container2.Name = "container2"; cts.SaveContainer(container2); diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs index aa8f68febf..dd8ba87133 100644 --- a/src/Umbraco.Tests/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs @@ -394,7 +394,7 @@ namespace Umbraco.Tests.Services { var service = ServiceContext.EntityService; - var objectTypeId = new Guid(Constants.ObjectTypes.Document); + var objectTypeId = Constants.ObjectTypes.Document; var entities = service.GetAll(objectTypeId).ToArray(); Assert.That(entities.Any(), Is.True); @@ -454,7 +454,7 @@ namespace Umbraco.Tests.Services public void EntityService_Throws_When_Getting_All_With_Invalid_Type() { var service = ServiceContext.EntityService; - var objectTypeId = new Guid(Constants.ObjectTypes.ContentItem); + var objectTypeId = Constants.ObjectTypes.ContentItem; Assert.Throws(() => service.GetAll()); Assert.Throws(() => service.GetAll(UmbracoObjectTypes.ContentItem)); @@ -477,7 +477,7 @@ namespace Umbraco.Tests.Services { var service = ServiceContext.EntityService; - var objectTypeId = new Guid(Constants.ObjectTypes.DocumentType); + var objectTypeId = Constants.ObjectTypes.DocumentType; var entities = service.GetAll(objectTypeId).ToArray(); Assert.That(entities.Any(), Is.True); diff --git a/src/Umbraco.Tests/Services/RelationServiceTests.cs b/src/Umbraco.Tests/Services/RelationServiceTests.cs index 4f22f7eda1..806d97fe5b 100644 --- a/src/Umbraco.Tests/Services/RelationServiceTests.cs +++ b/src/Umbraco.Tests/Services/RelationServiceTests.cs @@ -15,7 +15,7 @@ namespace Umbraco.Tests.Services public void Can_Create_RelationType_Without_Name() { var rs = ServiceContext.RelationService; - var rt = new RelationType(new Guid(Constants.ObjectTypes.Document), new Guid(Constants.ObjectTypes.Document), "repeatedEventOccurence"); + var rt = new RelationType(Constants.ObjectTypes.Document, Constants.ObjectTypes.Document, "repeatedEventOccurence"); Assert.DoesNotThrow(() => rs.Save(rt)); diff --git a/src/Umbraco.Web/Models/Mapping/EntityProfile.cs b/src/Umbraco.Web/Models/Mapping/EntityProfile.cs index ff5999f883..cbce64ce09 100644 --- a/src/Umbraco.Web/Models/Mapping/EntityProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/EntityProfile.cs @@ -27,7 +27,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember(dest => dest.Alias, opt => opt.Ignore()) .AfterMap((src, dest) => { - if (src.NodeObjectTypeId == Constants.ObjectTypes.MemberGuid && dest.Icon.IsNullOrWhiteSpace()) + if (src.NodeObjectTypeId == Constants.ObjectTypes.Member && dest.Icon.IsNullOrWhiteSpace()) { dest.Icon = "icon-user"; } @@ -89,15 +89,15 @@ namespace Umbraco.Web.Models.Mapping { if (basic.Icon.IsNullOrWhiteSpace()) { - if (entity.NodeObjectTypeId == Constants.ObjectTypes.MemberGuid) + if (entity.NodeObjectTypeId == Constants.ObjectTypes.Member) basic.Icon = "icon-user"; - else if (entity.NodeObjectTypeId == Constants.ObjectTypes.DataTypeGuid) + else if (entity.NodeObjectTypeId == Constants.ObjectTypes.DataType) basic.Icon = "icon-autofill"; - else if (entity.NodeObjectTypeId == Constants.ObjectTypes.DocumentTypeGuid) + else if (entity.NodeObjectTypeId == Constants.ObjectTypes.DocumentType) basic.Icon = "icon-item-arrangement"; - else if (entity.NodeObjectTypeId == Constants.ObjectTypes.MediaTypeGuid) + else if (entity.NodeObjectTypeId == Constants.ObjectTypes.MediaType) basic.Icon = "icon-thumbnails"; - else if (entity.NodeObjectTypeId == Constants.ObjectTypes.TemplateTypeGuid) + else if (entity.NodeObjectTypeId == Constants.ObjectTypes.TemplateType) basic.Icon = "icon-newspaper-alt"; } }); diff --git a/src/Umbraco.Web/Models/Mapping/UserProfile.cs b/src/Umbraco.Web/Models/Mapping/UserProfile.cs index 76b19ecf3d..b797da4148 100644 --- a/src/Umbraco.Web/Models/Mapping/UserProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/UserProfile.cs @@ -164,7 +164,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember(x => x.AssignedPermissions, opt => opt.Ignore()) .AfterMap((entity, basic) => { - if (entity.NodeObjectTypeId == Constants.ObjectTypes.MemberGuid && basic.Icon.IsNullOrWhiteSpace()) + if (entity.NodeObjectTypeId == Constants.ObjectTypes.Member && basic.Icon.IsNullOrWhiteSpace()) { basic.Icon = "icon-user"; } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs index ef3cdf3e30..4bf2ab2a4d 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/Database.cs @@ -32,7 +32,7 @@ LEFT JOIN cmsDocument docPub ON (docPub.nodeId=n.id AND docPub.published=1) LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND n.id=@id -", new { objType = Constants.ObjectTypes.DocumentGuid, /*id =*/ id })).FirstOrDefault(); +", new { objType = Constants.ObjectTypes.Document, /*id =*/ id })).FirstOrDefault(); return dto == null ? new ContentNodeKit() : CreateContentNodeKit(dto); } @@ -52,7 +52,7 @@ JOIN cmsContent ON (cmsContent.nodeId=n.id) JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND n.id=@id -", new { objType = Constants.ObjectTypes.MediaGuid, /*id =*/ id })).FirstOrDefault(); +", new { objType = Constants.ObjectTypes.Media, /*id =*/ id })).FirstOrDefault(); return dto == null ? new ContentNodeKit() : CreateMediaNodeKit(dto); } @@ -77,7 +77,7 @@ LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType ORDER BY n.level, n.sortOrder -", new { objType = Constants.ObjectTypes.DocumentGuid })).Select(CreateContentNodeKit); +", new { objType = Constants.ObjectTypes.Document })).Select(CreateContentNodeKit); } public IEnumerable GetAllMediaSources(IScopeUnitOfWork uow) @@ -97,7 +97,7 @@ JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType ORDER BY n.level, n.sortOrder -", new { objType = Constants.ObjectTypes.MediaGuid })).Select(CreateMediaNodeKit); +", new { objType = Constants.ObjectTypes.Media })).Select(CreateMediaNodeKit); } public IEnumerable GetBranchContentSources(IScopeUnitOfWork uow, int id) @@ -120,7 +120,7 @@ LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND x.id=@id ORDER BY n.level, n.sortOrder -", new { objType = Constants.ObjectTypes.DocumentGuid, /*id =*/ id })).Select(CreateContentNodeKit); +", new { objType = Constants.ObjectTypes.Document, /*id =*/ id })).Select(CreateContentNodeKit); } public IEnumerable GetBranchMediaSources(IScopeUnitOfWork uow, int id) @@ -141,7 +141,7 @@ JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND x.id=@id ORDER BY n.level, n.sortOrder -", new { objType = Constants.ObjectTypes.MediaGuid, /*id =*/ id })).Select(CreateMediaNodeKit); +", new { objType = Constants.ObjectTypes.Media, /*id =*/ id })).Select(CreateMediaNodeKit); } public IEnumerable GetTypeContentSources(IScopeUnitOfWork uow, IEnumerable ids) @@ -163,7 +163,7 @@ LEFT JOIN cmsContentNu nuDraft ON (nuDraft.nodeId=n.id AND nuDraft.published=0) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND cmsContent.contentType IN (@ids) ORDER BY n.level, n.sortOrder -", new { objType = Constants.ObjectTypes.DocumentGuid, /*id =*/ ids })).Select(CreateContentNodeKit); +", new { objType = Constants.ObjectTypes.Document, /*id =*/ ids })).Select(CreateContentNodeKit); } public IEnumerable GetTypeMediaSources(IScopeUnitOfWork uow, IEnumerable ids) @@ -183,7 +183,7 @@ JOIN cmsContentVersion ver ON (ver.contentId=n.id) LEFT JOIN cmsContentNu nuPub ON (nuPub.nodeId=n.id AND nuPub.published=1) WHERE n.nodeObjectType=@objType AND cmsContent.contentType IN (@ids) ORDER BY n.level, n.sortOrder -", new { objType = Constants.ObjectTypes.MediaGuid, /*id =*/ ids })).Select(CreateMediaNodeKit); +", new { objType = Constants.ObjectTypes.Media, /*id =*/ ids })).Select(CreateMediaNodeKit); } private static ContentNodeKit CreateContentNodeKit(ContentSourceDto dto) diff --git a/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs b/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs index b08e885446..216e8f97ca 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/FacadeService.cs @@ -1231,7 +1231,7 @@ namespace Umbraco.Web.PublishedCache.NuCache private void RebuildContentDbCacheLocked(IScopeUnitOfWork uow, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var contentObjectType = Guid.Parse(Constants.ObjectTypes.Document); + var contentObjectType = Constants.ObjectTypes.Document; var db = uow.Database; // remove all - if anything fails the transaction will rollback @@ -1302,7 +1302,7 @@ WHERE cmsContentNu.nodeId IN ( public void RebuildMediaDbCacheLocked(IScopeUnitOfWork uow, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media); + var mediaObjectType = Constants.ObjectTypes.Media; var db = uow.Database; // remove all - if anything fails the transaction will rollback @@ -1363,7 +1363,7 @@ WHERE cmsContentNu.nodeId IN ( public void RebuildMemberDbCacheLocked(IScopeUnitOfWork uow, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var memberObjectType = Guid.Parse(Constants.ObjectTypes.Member); + var memberObjectType = Constants.ObjectTypes.Member; var db = uow.Database; // remove all - if anything fails the transaction will rollback @@ -1425,7 +1425,7 @@ WHERE cmsContentNu.nodeId IN ( // every published content item should have a corresponding row in cmsContentXml // every content item should have a corresponding row in cmsPreviewXml - var contentObjectType = Guid.Parse(Constants.ObjectTypes.Document); + var contentObjectType = Constants.ObjectTypes.Document; var db = uow.Database; var count = db.ExecuteScalar(@"SELECT COUNT(*) @@ -1455,7 +1455,7 @@ AND cmsContentNu.nodeId IS NULL;" { // every non-trashed media item should have a corresponding row in cmsContentXml - var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media); + var mediaObjectType = Constants.ObjectTypes.Media; var db = uow.Database; var count = db.ExecuteScalar(@"SELECT COUNT(*) @@ -1485,7 +1485,7 @@ AND cmsContentNu.nodeId IS NULL { // every member item should have a corresponding row in cmsContentXml - var memberObjectType = Guid.Parse(Constants.ObjectTypes.Member); + var memberObjectType = Constants.ObjectTypes.Member; var db = uow.Database; var count = db.ExecuteScalar(@"SELECT COUNT(*) diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs index ad49cffd73..4d353a3411 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs @@ -449,7 +449,7 @@ AND (umbracoNode.id=@id)"; var xmlDtos = uow.Database.Query(sql, new { - nodeObjectType = new Guid(Constants.ObjectTypes.Media), + nodeObjectType = Constants.ObjectTypes.Media, id = mediaId }); xmlDto = xmlDtos.FirstOrDefault(); @@ -481,7 +481,7 @@ AND (umbracoNode.id=@id)"; var xmlDtos = uow.Database.Query(sql, new { - nodeObjectType = new Guid(Constants.ObjectTypes.Member), + nodeObjectType = Constants.ObjectTypes.Member, id = memberId }); xmlDto = xmlDtos.FirstOrDefault(); @@ -512,7 +512,7 @@ AND (umbracoNode.id=@id)"; var xmlDtos = uow.Database.Query(sql, new { - nodeObjectType = new Guid(Constants.ObjectTypes.Document), + nodeObjectType = Constants.ObjectTypes.Document, id = contentId }); xmlDto = xmlDtos.FirstOrDefault(); @@ -535,7 +535,7 @@ AND (umbracoNode.id=@id)"; // just here to replicate what uQuery was doing and show it can be done // but really - should not be used - return LoadMoreXmlFromDatabase(new Guid(Constants.ObjectTypes.Media)); + return LoadMoreXmlFromDatabase(Constants.ObjectTypes.Media); } public XmlDocument GetMemberXml() @@ -544,7 +544,7 @@ AND (umbracoNode.id=@id)"; // just here to replicate what uQuery was doing and show it can be done // but really - should not be used - return LoadMoreXmlFromDatabase(new Guid(Constants.ObjectTypes.Member)); + return LoadMoreXmlFromDatabase(Constants.ObjectTypes.Member); } public XmlDocument GetPreviewXml(int contentId, bool includeSubs) @@ -567,7 +567,7 @@ AND (umbracoNode.id=@id)"; var xmlDtos = uow.Database.Query(sql, new { - nodeObjectType = new Guid(Constants.ObjectTypes.Document), + nodeObjectType = Constants.ObjectTypes.Document, path = content.Path, }); @@ -922,7 +922,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; // get xml var xmlDtos = uow.Database.Query(ReadTreeCmsContentXmlSql, - new { nodeObjectType = new Guid(Constants.ObjectTypes.Document) }); + new { nodeObjectType = Constants.ObjectTypes.Document }); foreach (var xmlDto in xmlDtos) { @@ -954,11 +954,11 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; using (var uow = _uowProvider.CreateUnitOfWork()) { - if (nodeObjectType == Constants.ObjectTypes.DocumentGuid) + if (nodeObjectType == Constants.ObjectTypes.Document) uow.ReadLock(Constants.Locks.ContentTree); - else if (nodeObjectType == Constants.ObjectTypes.MediaGuid) + else if (nodeObjectType == Constants.ObjectTypes.Media) uow.ReadLock(Constants.Locks.MediaTree); - else if (nodeObjectType == Constants.ObjectTypes.MemberGuid) + else if (nodeObjectType == Constants.ObjectTypes.Member) uow.ReadLock(Constants.Locks.MemberTree); var xmlDtos = uow.Database.Query(ReadMoreCmsContentXmlSql, @@ -1087,7 +1087,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; var xmlDtos = uow.Database.Query(ReadBranchCmsContentXmlSql, new { - nodeObjectType = new Guid(Constants.ObjectTypes.Document), + nodeObjectType = Constants.ObjectTypes.Document, path = content.Path + ",%", id = content.Id }); @@ -1262,7 +1262,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; { uow.ReadLock(Constants.Locks.ContentTree); var xmlDtos = uow.Database.Query(ReadCmsContentXmlForContentTypesSql, - new { nodeObjectType = new Guid(Constants.ObjectTypes.Document), /*@ids =*/ ids }); + new { nodeObjectType = Constants.ObjectTypes.Document, /*@ids =*/ ids }); foreach (var xmlDto in xmlDtos) { @@ -1702,7 +1702,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; private void RebuildContentXmlLocked(IScopeUnitOfWork unitOfWork, IContentRepository repository, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var contentObjectType = Guid.Parse(Constants.ObjectTypes.Document); + var contentObjectType = Constants.ObjectTypes.Document; var db = unitOfWork.Database; // remove all - if anything fails the transaction will rollback @@ -1775,7 +1775,7 @@ WHERE cmsContentXml.nodeId IN ( private void RebuildPreviewXmlLocked(IScopeUnitOfWork unitOfWork, IContentRepository repository, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var contentObjectType = Guid.Parse(Constants.ObjectTypes.Document); + var contentObjectType = Constants.ObjectTypes.Document; var db = unitOfWork.Database; // remove all - if anything fails the transaction will rollback @@ -1852,7 +1852,7 @@ WHERE cmsPreviewXml.nodeId IN ( public void RebuildMediaXmlLocked(IScopeUnitOfWork unitOfWork, IMediaRepository repository, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media); + var mediaObjectType = Constants.ObjectTypes.Media; var db = unitOfWork.Database; // remove all - if anything fails the transaction will rollback @@ -1923,7 +1923,7 @@ WHERE cmsContentXml.nodeId IN ( public void RebuildMemberXmlLocked(IScopeUnitOfWork unitOfWork, IMemberRepository repository, int groupSize, IEnumerable contentTypeIds) { var contentTypeIdsA = contentTypeIds?.ToArray(); - var memberObjectType = Guid.Parse(Constants.ObjectTypes.Member); + var memberObjectType = Constants.ObjectTypes.Member; var db = unitOfWork.Database; // remove all - if anything fails the transaction will rollback @@ -1995,7 +1995,7 @@ WHERE cmsContentXml.nodeId IN ( // every content item should have a corresponding row in cmsPreviewXml // and that row should have the key="..." attribute - var contentObjectType = Guid.Parse(Constants.ObjectTypes.Document); + var contentObjectType = Constants.ObjectTypes.Document; var db = unitOfWork.Database; var count = db.ExecuteScalar(@"SELECT COUNT(*) @@ -2037,7 +2037,7 @@ AND cmsPreviewXml.nodeId IS NULL OR cmsPreviewXml.xml NOT LIKE '% key=""' // and that row should have the key="..." attribute // fixme - where's the trashed test here? - var mediaObjectType = Guid.Parse(Constants.ObjectTypes.Media); + var mediaObjectType = Constants.ObjectTypes.Media; var db = unitOfWork.Database; var count = db.ExecuteScalar(@"SELECT COUNT(*) @@ -2068,7 +2068,7 @@ AND cmsContentXml.nodeId IS NULL OR cmsContentXml.xml NOT LIKE '% key=""' { // every member item should have a corresponding row in cmsContentXml - var memberObjectType = Guid.Parse(Constants.ObjectTypes.Member); + var memberObjectType = Constants.ObjectTypes.Member; var db = unitOfWork.Database; var count = db.ExecuteScalar(@"SELECT COUNT(*) diff --git a/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs b/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs index a11c794844..78b5429e63 100644 --- a/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs +++ b/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs @@ -44,9 +44,9 @@ namespace Umbraco.Web.Strategies.Migrations return; } - e.MigrationContext.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - e.MigrationContext.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); - e.MigrationContext.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); + e.MigrationContext.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultContentListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-95", SortOrder = 2, UniqueId = new Guid("C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Content", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + e.MigrationContext.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMediaListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-96", SortOrder = 2, UniqueId = new Guid("3A0156C4-3B8C-4803-BDC1-6871FAA83FFF"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Media", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); + e.MigrationContext.Database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = Constants.DataTypes.DefaultMembersListView, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-97", SortOrder = 2, UniqueId = new Guid("AA2C52A0-CE87-4E65-A47C-7DF09358585D"), Text = Constants.Conventions.DataTypes.ListViewPrefix + "Members", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now }); } finally { diff --git a/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs b/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs index 364d088ac9..258c16301a 100644 --- a/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs +++ b/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs @@ -32,7 +32,7 @@ namespace Umbraco.Web.Strategies.Migrations .On(left => left.NodeId, right => right.NodeId) .InnerJoin() .On(left => left.NodeId, right => right.NodeId) - .Where(x => x.NodeObjectType == new Guid(Constants.ObjectTypes.Document)) + .Where(x => x.NodeObjectType == Constants.ObjectTypes.Document) .Where(x => x.Path.StartsWith("-1")); var dtos = args.MigrationContext.Database.Fetch(sql); diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs index a0852c94f4..ebf78c2069 100644 --- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs @@ -57,7 +57,7 @@ namespace Umbraco.Web.Trees nodes.AddRange(docTypeEntities .Select(entity => { - var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprintGuid, id, queryStrings, "icon-item-arrangement", true); + var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, "icon-item-arrangement", true); treeNode.Path = string.Format("-1,{0}", entity.Id); treeNode.NodeType = "document-type-blueprints"; //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. @@ -77,7 +77,7 @@ namespace Umbraco.Web.Trees nodes.AddRange(blueprintsForDocType .Select(entity => { - var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprintGuid, id, queryStrings, "icon-blueprint", false); + var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, "icon-blueprint", false); treeNode.Path = $"-1,{ct.Id},{entity.Id}"; return treeNode; })); diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 96cdaae1e4..cc5c5ebfbd 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -64,7 +64,7 @@ namespace Umbraco.Web.Trees var node = CreateTreeNode( entity, - Constants.ObjectTypes.DocumentGuid, + Constants.ObjectTypes.Document, parentId, queryStrings, entity.HasChildren && isContainer == false); diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs index 6a61246db6..4b26f8d065 100644 --- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs @@ -51,7 +51,7 @@ namespace Umbraco.Web.Trees // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to. // need this check to keep supporting sites where childs have already been created. var hasChildren = dt.HasChildren(); - var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentTypeGuid, id, queryStrings, "icon-item-arrangement", hasChildren); + var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, "icon-item-arrangement", hasChildren); node.Path = dt.Path; return node; diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs index abf6cd9e53..9b5370edd8 100644 --- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs @@ -35,7 +35,7 @@ namespace Umbraco.Web.Trees .OrderBy(entity => entity.Name) .Select(dt => { - var node = CreateTreeNode(dt, Constants.ObjectTypes.DataTypeGuid, id, queryStrings, "icon-folder", dt.HasChildren()); + var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, "icon-folder", dt.HasChildren()); node.Path = dt.Path; node.NodeType = "container"; //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs index c6a40319c9..7a3a557216 100644 --- a/src/Umbraco.Web/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTreeController.cs @@ -58,7 +58,7 @@ namespace Umbraco.Web.Trees var node = CreateTreeNode( entity, - Constants.ObjectTypes.MediaGuid, + Constants.ObjectTypes.Media, parentId, queryStrings, entity.HasChildren && (isContainer == false)); diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs index 75a953a5ef..99788e093b 100644 --- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs @@ -52,7 +52,7 @@ namespace Umbraco.Web.Trees // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to. // need this check to keep supporting sites where childs have already been created. var hasChildren = dt.HasChildren(); - var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaTypeGuid, id, queryStrings, "icon-thumbnails", hasChildren); + var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings, "icon-thumbnails", hasChildren); node.Path = dt.Path; return node; diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index d724e07e56..231e05d59e 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -82,7 +82,7 @@ namespace Umbraco.Web.Trees "icon-user", false, "", - Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(Constants.ObjectTypes.MemberGuid), member.Key)); + Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(Constants.ObjectTypes.Member), member.Key)); node.AdditionalData.Add("contentType", member.ContentTypeAlias); node.AdditionalData.Add("isContainer", true); diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs index 9c8c7b8e32..10b5d35b6e 100644 --- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs @@ -15,7 +15,7 @@ namespace Umbraco.Web.Trees { return Services.MemberTypeService.GetAll() .OrderBy(x => x.Name) - .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberTypeGuid, id, queryStrings, "icon-item-arrangement", false)); + .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberType, id, queryStrings, "icon-item-arrangement", false)); } } } diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs index 91bc7abf7f..ddde201e8b 100644 --- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs +++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs @@ -51,7 +51,7 @@ namespace Umbraco.Web.Trees template.IsMasterTemplate ? "icon-newspaper" : "icon-newspaper-alt", template.IsMasterTemplate, GetEditorPath(template, queryStrings), - Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(Constants.ObjectTypes.TemplateTypeGuid), template.Key) + Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(Constants.ObjectTypes.TemplateType), template.Key) ))); return nodes; @@ -105,7 +105,7 @@ namespace Umbraco.Web.Trees Id = template.Id, Key = template.Key, Name = template.Name, - NodeObjectTypeId = new Guid(Constants.ObjectTypes.Template), + NodeObjectTypeId = Constants.ObjectTypes.Template, //TODO: Fix parent/paths on templates ParentId = -1, Path = template.Path, diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs index 3cfe6ff34e..9a19e13641 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs @@ -72,18 +72,18 @@ namespace umbraco.cms.presentation.developer.RelationTypes /// control for which to add the Umbraco object types private void AppendUmbracoObjectTypes(ListControl dropDownList) { - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Document.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.Document)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Media.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.Media)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Member.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.Member)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.MediaType.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.MediaType)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.DocumentType.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.DocumentType)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.MemberType.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.MemberType)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.DataType.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.DataType)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.MemberGroup.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.MemberGroup)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Stylesheet.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.Stylesheet)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Template.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.Template)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.ROOT.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.SystemRoot)); - dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.RecycleBin.GetFriendlyName(), Umbraco.Core.Constants.ObjectTypes.ContentRecycleBin)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Document.GetFriendlyName(), Constants.ObjectTypes.Strings.Document)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Media.GetFriendlyName(), Constants.ObjectTypes.Strings.Media)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Member.GetFriendlyName(), Constants.ObjectTypes.Strings.Member)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.MediaType.GetFriendlyName(), Constants.ObjectTypes.Strings.MediaType)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.DocumentType.GetFriendlyName(), Constants.ObjectTypes.Strings.DocumentType)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.MemberType.GetFriendlyName(), Constants.ObjectTypes.Strings.MemberType)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.DataType.GetFriendlyName(), Constants.ObjectTypes.Strings.DataType)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.MemberGroup.GetFriendlyName(), Constants.ObjectTypes.Strings.MemberGroup)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Stylesheet.GetFriendlyName(), Constants.ObjectTypes.Strings.Stylesheet)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.Template.GetFriendlyName(), Constants.ObjectTypes.Strings.Template)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.ROOT.GetFriendlyName(), Constants.ObjectTypes.Strings.SystemRoot)); + dropDownList.Items.Add(new ListItem(UmbracoObjectTypes.RecycleBin.GetFriendlyName(), Constants.ObjectTypes.Strings.ContentRecycleBin)); } } }