diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index 8cfa743964..e42a37aec3 100644 --- a/src/Umbraco.Core/Models/ContentExtensions.cs +++ b/src/Umbraco.Core/Models/ContentExtensions.cs @@ -247,7 +247,7 @@ namespace Umbraco.Core.Models var thumbUrl = Resize(fs, fileName, extension, 100, "thumb"); //Look up Prevalues for this upload datatype - if it is an upload datatype - var uploadFieldId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c"); + var uploadFieldId = new Guid(Constants.PropertyEditors.UploadField); if (property.PropertyType.DataTypeId == uploadFieldId) { //Get Prevalues by the DataType's Id: property.PropertyType.DataTypeId diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs index 421af3140e..a0829f34fb 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs @@ -99,36 +99,36 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateUmbracNodeData() { - _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("ea7d8624-4cfe-4578-a871-24aa946bf34d"), 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("01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8"), 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 = 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.RecycleBin), 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("CF3D8E34-1C1C-41e9-AE56-878B57B32113"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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 = "Textbox multiple", NodeObjectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -38, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-38", SortOrder = 2, UniqueId = new Guid("fd9f1447-6c61-4a7c-9595-5aa39147d318"), Text = "Folder Browser", NodeObjectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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 = "Folder", NodeObjectType = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"), 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 = "Image", NodeObjectType = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"), 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 = "File", NodeObjectType = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1034, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1034", SortOrder = 2, UniqueId = new Guid("a6857c73-d6e9-480c-b6e6-f15f6ad11125"), Text = "Content Picker", NodeObjectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1035, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1035", SortOrder = 2, UniqueId = new Guid("93929b9a-93a2-4e2a-b239-d99334440a59"), Text = "Media Picker", NodeObjectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1036, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1036", SortOrder = 2, UniqueId = new Guid("2b24165f-9782-4aa3-b459-1de4a4d21f60"), Text = "Member Picker", NodeObjectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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 = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), CreateDate = DateTime.Now }); - _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1040, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1040", SortOrder = 2, UniqueId = new Guid("21e798da-e06e-4eda-a511-ed257f78d4fa"), Text = "Related Links", NodeObjectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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("30a2a501-1978-4ddb-a57b-f7efed43ba3c"), 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 = "Textbox multiple", 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 = -38, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,-38", SortOrder = 2, UniqueId = new Guid("fd9f1447-6c61-4a7c-9595-5aa39147d318"), Text = "Folder Browser", 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 = 1031, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1031", SortOrder = 2, UniqueId = new Guid("f38bd2d7-65d0-48e6-95dc-87ce06ec2d3d"), Text = "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 = "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 = "File", NodeObjectType = new Guid(Constants.ObjectTypes.MediaType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1034, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1034", SortOrder = 2, UniqueId = new Guid("a6857c73-d6e9-480c-b6e6-f15f6ad11125"), Text = "Content Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1035, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1035", SortOrder = 2, UniqueId = new Guid("93929b9a-93a2-4e2a-b239-d99334440a59"), Text = "Media Picker", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), CreateDate = DateTime.Now }); + _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = 1036, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1036", SortOrder = 2, UniqueId = new Guid("2b24165f-9782-4aa3-b459-1de4a4d21f60"), Text = "Member 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 = 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 = 1040, Trashed = false, ParentId = -1, UserId = 0, Level = 1, Path = "-1,1040", SortOrder = 2, UniqueId = new Guid("21e798da-e06e-4eda-a511-ed257f78d4fa"), Text = "Related Links", NodeObjectType = new Guid(Constants.ObjectTypes.DataType), 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 = 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 = 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 }); } private void CreateCmsContentTypeData() @@ -217,23 +217,23 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateCmsDataTypeData() { //TODO Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors. - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 1, DataTypeId = -49, ControlId = new Guid("38b352c1-e9f8-4fd8-9324-9a2eab06d97a"), DbType = "Integer" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 2, DataTypeId = -51, ControlId = new Guid("1413afcb-d19a-4173-8e9a-68288d2a73b8"), DbType = "Integer" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 3, DataTypeId = -87, ControlId = new Guid("5E9B75AE-FACE-41c8-B47E-5F4B0FD82F83"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 4, DataTypeId = -88, ControlId = new Guid("ec15c1e5-9d90-422a-aa52-4f7622c63bea"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 5, DataTypeId = -89, ControlId = new Guid("67db8357-ef57-493e-91ac-936d305e0f2a"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 6, DataTypeId = -90, ControlId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c"), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 1, DataTypeId = -49, ControlId = new Guid(Constants.PropertyEditors.TrueFalse), DbType = "Integer" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 2, DataTypeId = -51, ControlId = new Guid(Constants.PropertyEditors.Integer), DbType = "Integer" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 3, DataTypeId = -87, ControlId = new Guid(Constants.PropertyEditors.TinyMCEv3), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 4, DataTypeId = -88, ControlId = new Guid(Constants.PropertyEditors.Textbox), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 5, DataTypeId = -89, ControlId = new Guid(Constants.PropertyEditors.TextboxMultiple), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 6, DataTypeId = -90, ControlId = new Guid(Constants.PropertyEditors.UploadField), DbType = "Nvarchar" }); //Dropdown list //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 12, DataTypeId = -91, ControlId = new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 7, DataTypeId = -92, ControlId = new Guid("6c738306-4c17-4d88-b9bd-6546f3771597"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 8, DataTypeId = -36, ControlId = new Guid("b6fb1622-afa5-4bbf-a3cc-d9672a442222"), DbType = "Date" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 9, DataTypeId = -37, ControlId = new Guid("f8d60f68-ec59-4974-b43b-c46eb5677985"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 10, DataTypeId = -38, ControlId = new Guid("cccd4ae9-f399-4ed2-8038-2e88d19e810c"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 11, DataTypeId = -39, ControlId = new Guid("928639ed-9c73-4028-920c-1e55dbb68783"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 12, DataTypeId = -40, ControlId = new Guid("a52c7c1c-c330-476e-8605-d63d3b84b6a6"), DbType = "Nvarchar" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 13, DataTypeId = -41, ControlId = new Guid("23e93522-3200-44e2-9f29-e61a6fcbb79a"), DbType = "Date" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 14, DataTypeId = -42, ControlId = new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6"), DbType = "Integer" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 15, DataTypeId = -43, ControlId = new Guid("b4471851-82b6-4c75-afa4-39fa9c6a75e9"), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 7, DataTypeId = -92, ControlId = new Guid(Constants.PropertyEditors.NoEdit), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 8, DataTypeId = -36, ControlId = new Guid(Constants.PropertyEditors.DateTime), DbType = "Date" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 9, DataTypeId = -37, ControlId = new Guid(Constants.PropertyEditors.ColorPicker), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 10, DataTypeId = -38, ControlId = new Guid(Constants.PropertyEditors.FolderBrowser), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 11, DataTypeId = -39, ControlId = new Guid(Constants.PropertyEditors.DropDownListMultiple), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 12, DataTypeId = -40, ControlId = new Guid(Constants.PropertyEditors.RadioButtonList), DbType = "Nvarchar" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 13, DataTypeId = -41, ControlId = new Guid(Constants.PropertyEditors.Date), DbType = "Date" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 14, DataTypeId = -42, ControlId = new Guid(Constants.PropertyEditors.DropDownList), DbType = "Integer" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 15, DataTypeId = -43, ControlId = new Guid(Constants.PropertyEditors.CheckBoxList), DbType = "Nvarchar" }); // Fix for rich text editor backwards compatibility -> 83722133-f80c-4273-bdb6-1befaa04a612 TinyMCE DataType //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 22, DataTypeId = -44, ControlId = new Guid("a3776494-0574-4d93-b7de-efdfdec6f2d1"), DbType = "Ntext" }); //Radiobutton list @@ -252,15 +252,15 @@ namespace Umbraco.Core.Persistence.Migrations.Initial //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 29, DataTypeId = -134, ControlId = new Guid("928639ed-9c73-4028-920c-1e55dbb68783"), DbType = "Nvarchar" }); //Not found - maybe a legacy thing? //_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 30, DataTypeId = -50, ControlId = new Guid("aaf99bb2-dbbe-444d-a296-185076bf0484"), DbType = "Date" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 16, DataTypeId = 1034, ControlId = new Guid("158aa029-24ed-4948-939e-c3da209e5fba"), DbType = "Integer" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 17, DataTypeId = 1035, ControlId = new Guid("ead69342-f06d-4253-83ac-28000225583b"), DbType = "Integer" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 18, DataTypeId = 1036, ControlId = new Guid("39f533e4-0551-4505-a64b-e0425c5ce775"), DbType = "Integer" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 19, DataTypeId = 1038, ControlId = new Guid("60b7dabf-99cd-41eb-b8e9-4d2e669bbde9"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 20, DataTypeId = 1039, ControlId = new Guid("cdbf0b5d-5cb2-445f-bc12-fcaaec07cf2c"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 21, DataTypeId = 1040, ControlId = new Guid("71b8ad1a-8dc2-425c-b6b8-faa158075e63"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 22, DataTypeId = 1041, ControlId = new Guid("4023e540-92f5-11dd-ad8b-0800200c9a66"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 23, DataTypeId = 1042, ControlId = new Guid("474FCFF8-9D2D-11DE-ABC6-AD7A56D89593"), DbType = "Ntext" }); - _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 24, DataTypeId = 1043, ControlId = new Guid("7A2D436C-34C2-410F-898F-4A23B3D79F54"), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 16, DataTypeId = 1034, ControlId = new Guid(Constants.PropertyEditors.ContentPicker), DbType = "Integer" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 17, DataTypeId = 1035, ControlId = new Guid(Constants.PropertyEditors.MediaPicker), DbType = "Integer" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 18, DataTypeId = 1036, ControlId = new Guid(Constants.PropertyEditors.MemberPicker), DbType = "Integer" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 19, DataTypeId = 1038, ControlId = new Guid(Constants.PropertyEditors.UltraSimpleEditor), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 20, DataTypeId = 1039, ControlId = new Guid(Constants.PropertyEditors.UltimatePicker), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 21, DataTypeId = 1040, ControlId = new Guid(Constants.PropertyEditors.RelatedLinks), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 22, DataTypeId = 1041, ControlId = new Guid(Constants.PropertyEditors.Tags), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 23, DataTypeId = 1042, ControlId = new Guid(Constants.PropertyEditors.MacroContainer), DbType = "Ntext" }); + _database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 24, DataTypeId = 1043, ControlId = new Guid(Constants.PropertyEditors.ImageCropper), DbType = "Ntext" }); } private void CreateCmsDataTypePreValuesData() @@ -271,7 +271,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial private void CreateUmbracoRelationTypeData() { - _database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Id = 1, Alias = "relateDocumentOnCopy", ChildObjectType = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), ParentObjectType = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), Dual = true, Name = "Relate Document On Copy" }); + _database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Id = 1, Alias = "relateDocumentOnCopy", ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), Dual = true, Name = "Relate Document On Copy" }); } private void CreateCmsTaskTypeData() diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index c6281a44ff..d073f30d0b 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -141,7 +141,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Guid NodeObjectTypeId { - get { return new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"); } + get { return new Guid(Constants.ObjectTypes.Document); } } #endregion @@ -367,7 +367,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override void PersistDeletedItem(IContent entity) { var fs = FileSystemProviderManager.Current.GetFileSystemProvider(); - var uploadFieldId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c"); + var uploadFieldId = new Guid(Constants.PropertyEditors.UploadField); //Loop through properties to check if the content contains images/files that should be deleted foreach (var property in entity.Properties) { diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs index 33c9020e44..3aa55b36e3 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs @@ -177,7 +177,7 @@ namespace Umbraco.Core.Persistence.Repositories .From() .InnerJoin() .On(left => left.NodeId, right => right.NodeId) - .Where(x => x.NodeObjectType == new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972")) + .Where(x => x.NodeObjectType == new Guid(Constants.ObjectTypes.Document)) .Where(x => x.ContentTypeId == entity.Id); var contentDtos = Database.Fetch(sql); diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs index e28e38efa1..6432b9f4e7 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs @@ -158,7 +158,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Guid NodeObjectTypeId { - get { return new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"); } + get { return new Guid(Constants.ObjectTypes.DocumentType); } } #endregion diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs index 8cb8e4bbda..7fd5d7b2c3 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs @@ -105,7 +105,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Guid NodeObjectTypeId { - get { return new Guid("30A2A501-1978-4DDB-A57B-F7EFED43BA3C"); } + get { return new Guid(Constants.ObjectTypes.DataType); } } #endregion diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index 3e2152e37c..793a490b2c 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Guid NodeObjectTypeId { - get { return new Guid("B796F64C-1F99-4FFB-B886-4BF4BC011A9C"); } + get { return new Guid(Constants.ObjectTypes.Media); } } #endregion @@ -306,7 +306,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override void PersistDeletedItem(IMedia entity) { var fs = FileSystemProviderManager.Current.GetFileSystemProvider(); - var uploadFieldId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c"); + var uploadFieldId = new Guid(Constants.PropertyEditors.UploadField); //Loop through properties to check if the media item contains images/file that should be deleted foreach (var property in entity.Properties) { diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs index b787bf5df8..e0204a3634 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs @@ -139,7 +139,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Guid NodeObjectTypeId { - get { return new Guid("4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E"); } + get { return new Guid(Constants.ObjectTypes.MediaType); } } #endregion diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs index 09d17aed8f..3dda7bc735 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs @@ -164,7 +164,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override Guid NodeObjectTypeId { - get { return new Guid("6FBDE604-4178-42CE-A10B-8A2600A2F07D"); } + get { return new Guid(Constants.ObjectTypes.Template); } } protected override void PersistNewItem(ITemplate entity) diff --git a/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs index 5d437f5d91..658de7e399 100644 --- a/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs @@ -9,8 +9,8 @@ namespace Umbraco.Core.PropertyEditors { return (new[] { - Guid.Parse("b6fb1622-afa5-4bbf-a3cc-d9672a442222"), - Guid.Parse("23e93522-3200-44e2-9f29-e61a6fcbb79a") + Guid.Parse(Constants.PropertyEditors.DateTime), + Guid.Parse(Constants.PropertyEditors.Date) }).Contains(propertyEditorId); } diff --git a/src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs index 5861f41c4d..fec80ddc85 100644 --- a/src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs @@ -10,7 +10,7 @@ namespace Umbraco.Core.PropertyEditors { public bool IsConverterFor(Guid propertyEditorId, string docTypeAlias, string propertyTypeAlias) { - return Guid.Parse("5e9b75ae-face-41c8-b47e-5f4b0fd82f83").Equals(propertyEditorId); + return Guid.Parse(Constants.PropertyEditors.TinyMCEv3).Equals(propertyEditorId); } /// diff --git a/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs index 3cac051c94..6e52ca295b 100644 --- a/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.PropertyEditors { public bool IsConverterFor(Guid propertyEditorId, string docTypeAlias, string propertyTypeAlias) { - return Guid.Parse("38b352c1-e9f8-4fd8-9324-9a2eab06d97a").Equals(propertyEditorId); + return Guid.Parse(Constants.PropertyEditors.TrueFalse).Equals(propertyEditorId); } /// diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index c46dd0d901..b00c6b8c57 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -927,7 +927,7 @@ namespace Umbraco.Core.Services uow.Commit(); //Special case for the Upload DataType - var uploadDataTypeId = new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c"); + var uploadDataTypeId = new Guid(Constants.PropertyEditors.UploadField); if (content.Properties.Any(x => x.PropertyType.DataTypeId == uploadDataTypeId)) { bool isUpdated = false; @@ -964,7 +964,7 @@ namespace Umbraco.Core.Services } //Special case for the Tags DataType - var tagsDataTypeId = new Guid("4023e540-92f5-11dd-ad8b-0800200c9a66"); + var tagsDataTypeId = new Guid(Constants.PropertyEditors.Tags); if (content.Properties.Any(x => x.PropertyType.DataTypeId == tagsDataTypeId)) { var tags = uow.Database.Fetch("WHERE nodeId = @Id", new {Id = content.Id}); diff --git a/src/Umbraco.Tests/CodeFirst/Definitions/Conventions.cs b/src/Umbraco.Tests/CodeFirst/Definitions/Conventions.cs index fde708e85d..bc01c49e80 100644 --- a/src/Umbraco.Tests/CodeFirst/Definitions/Conventions.cs +++ b/src/Umbraco.Tests/CodeFirst/Definitions/Conventions.cs @@ -50,18 +50,18 @@ namespace Umbraco.Tests.CodeFirst.Definitions { if (type == typeof(bool)) { - return GetDataTypeByControlId(new Guid("38b352c1-e9f8-4fd8-9324-9a2eab06d97a"));// Yes/No DataType + return GetDataTypeByControlId(new Guid(Constants.PropertyEditors.TrueFalse));// Yes/No DataType } if (type == typeof(int)) { - return GetDataTypeByControlId(new Guid("1413afcb-d19a-4173-8e9a-68288d2a73b8"));// Number DataType + return GetDataTypeByControlId(new Guid(Constants.PropertyEditors.Integer));// Number DataType } if (type == typeof(DateTime)) { - return GetDataTypeByControlId(new Guid("23e93522-3200-44e2-9f29-e61a6fcbb79a"));// Date Picker DataType + return GetDataTypeByControlId(new Guid(Constants.PropertyEditors.Date));// Date Picker DataType } - return GetDataTypeByControlId(new Guid("ec15c1e5-9d90-422a-aa52-4f7622c63bea"));// Standard textfield + return GetDataTypeByControlId(new Guid(Constants.PropertyEditors.Textbox));// Standard textfield } /// diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs index 7e85f7cd9d..78254f6f32 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentRepositorySqlClausesTest.cs @@ -1,5 +1,6 @@ using System; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Tests.TestHelpers; @@ -12,7 +13,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectType = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"); + var NodeObjectType = new Guid(Constants.ObjectTypes.Document); var expected = new Sql(); expected.Select("*") @@ -41,7 +42,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Where_Clause() { - var NodeObjectType = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"); + var NodeObjectType = new Guid(Constants.ObjectTypes.Document); var expected = new Sql(); expected.Select("*") @@ -72,7 +73,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Where_With_Version_Clause() { - var NodeObjectType = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"); + var NodeObjectType = new Guid(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 cff1983b07..8fc664a0d2 100644 --- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs @@ -1,5 +1,6 @@ using System; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Tests.TestHelpers; @@ -12,7 +13,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectType = new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"); + var NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType); var expected = new Sql(); expected.Select("*") @@ -42,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Where_Clause() { - var NodeObjectType = new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"); + var NodeObjectType = new Guid(Constants.ObjectTypes.DocumentType); var expected = new Sql(); expected.Select("*") diff --git a/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs b/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs index efb392813e..1862c45952 100644 --- a/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs @@ -1,5 +1,6 @@ using System; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Tests.TestHelpers; @@ -12,7 +13,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectTypeId = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"); + var NodeObjectTypeId = new Guid(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 8d6c880d23..bbe90637f4 100644 --- a/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/MediaRepositorySqlClausesTest.cs @@ -1,5 +1,6 @@ using System; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Tests.TestHelpers; @@ -12,7 +13,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectTypeId = new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c"); + var NodeObjectTypeId = new Guid(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 e143d89534..2bdb58d5b8 100644 --- a/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs +++ b/src/Umbraco.Tests/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs @@ -1,5 +1,6 @@ using System; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; using Umbraco.Tests.TestHelpers; @@ -12,7 +13,7 @@ namespace Umbraco.Tests.Persistence.Querying [Test] public void Can_Verify_Base_Clause() { - var NodeObjectTypeId = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"); + var NodeObjectTypeId = new Guid(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 282d93bd1c..5823970874 100644 --- a/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs +++ b/src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs @@ -1,5 +1,6 @@ using System; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence; @@ -86,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Querying // Arrange var path = "-1,1046,1076,1089"; var id = 1046; - var nodeObjectTypeId = new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"); + var nodeObjectTypeId = new Guid(Constants.ObjectTypes.Document); var sql = new Sql(); sql.Select("*") diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs index 7fd9ed5127..d020228361 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Persistence; @@ -151,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = DatabaseContext.Database.ExecuteScalar( "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType", - new { NodeObjectType = new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB") }); + new { NodeObjectType = new Guid(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 5f1de8817f..0f19a5083f 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Membership; using Umbraco.Core.Persistence.Caching; @@ -96,7 +97,7 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = new DataTypeDefinitionRepository(unitOfWork, NullCacheProvider.Current); // Act - var query = Query.Builder.Where(x => x.ControlId == new Guid("A52C7C1C-C330-476E-8605-D63D3B84B6A6")); + var query = Query.Builder.Where(x => x.ControlId == new Guid(Constants.PropertyEditors.RadioButtonList)); var result = repository.GetByQuery(query); // Assert diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs index b7315de594..1aacaef52d 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Caching; @@ -145,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories int count = DatabaseContext.Database.ExecuteScalar( "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType", - new { NodeObjectType = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e") }); + new { NodeObjectType = new Guid(Constants.ObjectTypes.MediaType) }); // Assert Assert.That(mediaTypes.Any(), Is.True); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs index 2250cdecf0..ec14d6aaf2 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs @@ -245,8 +245,8 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var relateContent = new RelationType(new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy") { IsBidirectional = true, Name = "Relate Content on Copy" }; - var relateContentType = new RelationType(new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; + 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 provider = new PetaPocoUnitOfWorkProvider(); var unitOfWork = provider.GetUnitOfWork(); diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs index b0cef6a21d..eef7a8c133 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; @@ -43,8 +44,8 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = new RelationTypeRepository(unitOfWork); // Act - var relateMemberToContent = new RelationType(new Guid("39eb0f98-b348-42a1-8662-e7eb18487560"), - new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), + var relateMemberToContent = new RelationType(new Guid(Constants.ObjectTypes.Member), + new Guid(Constants.ObjectTypes.Document), "relateMemberToContent") {IsBidirectional = true, Name = "Relate Member to Content"}; @@ -196,7 +197,7 @@ namespace Umbraco.Tests.Persistence.Repositories var repository = new RelationTypeRepository(unitOfWork); // Act - var childObjType = new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"); + var childObjType = new Guid(Constants.ObjectTypes.DocumentType); var query = Query.Builder.Where(x => x.ChildObjectType == childObjType); var result = repository.GetByQuery(query); @@ -215,8 +216,8 @@ namespace Umbraco.Tests.Persistence.Repositories public void CreateTestData() { - var relateContent = new RelationType(new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"), "relateContentOnCopy"){IsBidirectional = true, Name = "Relate Content on Copy"}; - var relateContentType = new RelationType(new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"), "relateContentTypeOnCopy") { IsBidirectional = true, Name = "Relate ContentType on Copy" }; + 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 provider = new PetaPocoUnitOfWorkProvider(); var unitOfWork = provider.GetUnitOfWork(); diff --git a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs index 902cd30544..2d7e6aa69d 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs @@ -49,7 +49,7 @@ namespace Umbraco.Tests.PublishedContent if (propertyAlias == "content") { //return the rte type id - return Guid.Parse("5e9b75ae-face-41c8-b47e-5f4b0fd82f83"); + return Guid.Parse(Constants.PropertyEditors.TinyMCEv3); } return Guid.Empty; }; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs index e8229d4f24..8a8532275c 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs @@ -25,7 +25,7 @@ namespace Umbraco.Tests.PublishedContent if (propertyAlias == "content") { //return the rte type id - return Guid.Parse("5e9b75ae-face-41c8-b47e-5f4b0fd82f83"); + return Guid.Parse(Constants.PropertyEditors.TinyMCEv3); } return Guid.Empty; }; diff --git a/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs b/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs index 17832642f8..65aebcce0b 100644 --- a/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs +++ b/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs @@ -6,6 +6,7 @@ using System.Xml; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using umbraco.interfaces; +using Umbraco.Core; namespace Umbraco.Web.Strategies.DataTypes { @@ -28,7 +29,7 @@ namespace Umbraco.Web.Strategies.DataTypes { if (UmbracoSettings.ImageAutoFillImageProperties != null) { - var property = sender.GenericProperties.FirstOrDefault(x => x.PropertyType.DataTypeDefinition.DataType.Id == new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + var property = sender.GenericProperties.FirstOrDefault(x => x.PropertyType.DataTypeDefinition.DataType.Id == new Guid(Constants.PropertyEditors.UploadField)); if (property == null) return; @@ -41,7 +42,7 @@ namespace Umbraco.Web.Strategies.DataTypes { if (UmbracoSettings.ImageAutoFillImageProperties != null) { - var property = sender.GenericProperties.FirstOrDefault(x => x.PropertyType.DataTypeDefinition.DataType.Id == new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + var property = sender.GenericProperties.FirstOrDefault(x => x.PropertyType.DataTypeDefinition.DataType.Id == new Guid(Constants.PropertyEditors.UploadField)); if (property == null) return; diff --git a/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs b/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs index 4414589937..e3b9f70a1f 100644 --- a/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs +++ b/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs @@ -6,6 +6,7 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Migrations; using Umbraco.Core.Persistence.UnitOfWork; using umbraco.interfaces; +using Umbraco.Core; namespace Umbraco.Web.Strategies.Migrations { @@ -39,7 +40,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("C66BA18E-EAF3-4CFF-8A22-41B16D66A972")) + .Where(x => x.NodeObjectType == new Guid(Constants.ObjectTypes.Document)) .Where(x => x.Path.StartsWith("-1")); var uow = PetaPocoUnitOfWorkProvider.CreateUnitOfWork(); diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs index 205ddce19c..deddeb73f5 100644 --- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs +++ b/src/Umbraco.Web/WebServices/FolderBrowserService.cs @@ -42,7 +42,7 @@ namespace Umbraco.Web.WebServices { var fileProp = child.getProperty("umbracoFile") ?? child.GenericProperties.FirstOrDefault(x => - x.PropertyType.DataTypeDefinition.DataType.Id == new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + x.PropertyType.DataTypeDefinition.DataType.Id == new Guid(Constants.PropertyEditors.UploadField)); var fileUrl = fileProp != null ? fileProp.Value.ToString() : ""; var thumbUrl = ThumbnailProvidersResolver.Current.GetThumbnailUrl(fileUrl); diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs index 2d052e9f56..cf7c21ef65 100644 --- a/src/Umbraco.Web/umbraco.presentation/content.cs +++ b/src/Umbraco.Web/umbraco.presentation/content.cs @@ -20,6 +20,7 @@ using umbraco.DataLayer; using umbraco.presentation.nodeFactory; using Action = umbraco.BusinessLogic.Actions.Action; using Node = umbraco.NodeFactory.Node; +using Umbraco.Core; namespace umbraco { @@ -1111,7 +1112,7 @@ order by umbracoNode.level, umbracoNode.sortOrder"; IRecordsReader dr = SqlHelper.ExecuteReader(sql, SqlHelper.CreateParameter("@type", new Guid( - "C66BA18E-EAF3-4CFF-8A22-41B16D66A972"))) + Constants.ObjectTypes.Document))) ) { while (dr.Read()) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs index ee9762d2b4..4276a4b16d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMedia.cs @@ -24,6 +24,7 @@ using umbraco.DataLayer; using umbraco.BusinessLogic.Actions; using umbraco.BusinessLogic.Utils; using umbraco.cms.presentation.Trees; +using Umbraco.Core; namespace umbraco @@ -45,7 +46,7 @@ namespace umbraco static loadMedia() { LinkableMediaDataTypes = new List(); - LinkableMediaDataTypes.Add(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + LinkableMediaDataTypes.Add(new Guid(Constants.PropertyEditors.UploadField)); } public loadMedia(string application) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs index 20f9c6ce88..a416f5c4b9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/UploadMediaImage.ascx.cs @@ -7,6 +7,7 @@ using umbraco.BasePages; using umbraco.cms.businesslogic.datatype; using umbraco.interfaces; using Media = umbraco.cms.businesslogic.media.Media; +using Umbraco.Core; namespace umbraco.controls.Images { @@ -35,7 +36,7 @@ namespace umbraco.controls.Images /// public string OnClientUpload { get; set; } - protected IDataType UploadField = DataTypeDefinition.GetByDataTypeId(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")).DataType; + protected IDataType UploadField = DataTypeDefinition.GetByDataTypeId(new Guid(Constants.PropertyEditors.UploadField)).DataType; protected override void OnInit(EventArgs e) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs index 9f916b7ef6..17bc53a7f5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editMedia.aspx.cs @@ -8,6 +8,7 @@ using System.Linq; using System.IO; using Umbraco.Core.IO; using umbraco.cms.businesslogic.property; +using Umbraco.Core; namespace umbraco.cms.presentation { @@ -121,7 +122,7 @@ namespace umbraco.cms.presentation private void UpdateMediaFileLinksLiteral() { - var uploadField = new Factory().GetNewObject(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + var uploadField = new Factory().GetNewObject(new Guid(Constants.PropertyEditors.UploadField)); // always clear, incase the upload file was removed this.mediaFileLinksLiteral.Text = string.Empty; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentExtensions.cs index 0ff0dba254..ddd309064c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentExtensions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/ContentExtensions.cs @@ -5,6 +5,7 @@ using System.Linq; using umbraco.cms.businesslogic; using umbraco.cms.businesslogic.datatype; using System.Xml; +using Umbraco.Core; namespace umbraco { @@ -251,8 +252,8 @@ namespace umbraco // switch based on datatype of property being set - if setting a built in ddl or radion button list, then string supplied is checked against prevalues switch (dataTypeGuid.ToUpper()) { - case "A74EA9C9-8E18-4D2A-8CF6-73C6206C5DA6": // DropDownList - case "A52C7C1C-C330-476E-8605-D63D3B84B6A6": // RadioButtonList + case Constants.PropertyEditors.DropDownList: // DropDownList + case Constants.PropertyEditors.RadioButtonList: // RadioButtonList var preValues = PreValues.GetPreValues(property.PropertyType.DataTypeDefinition.Id); PreValue preValue = null; @@ -290,7 +291,7 @@ namespace umbraco break; - case "23E93522-3200-44E2-9F29-E61A6FCBB79A": // Date (NOTE: currently assumes database type is set to Date) + case Constants.PropertyEditors.Date: // Date (NOTE: currently assumes database type is set to Date) switch (Type.GetTypeCode(value.GetType())) { diff --git a/src/umbraco.MacroEngines/RazorDataTypeModels/HtmlStringDataTypeModel.cs b/src/umbraco.MacroEngines/RazorDataTypeModels/HtmlStringDataTypeModel.cs index 6763755767..e65c3cf979 100644 --- a/src/umbraco.MacroEngines/RazorDataTypeModels/HtmlStringDataTypeModel.cs +++ b/src/umbraco.MacroEngines/RazorDataTypeModels/HtmlStringDataTypeModel.cs @@ -13,7 +13,7 @@ namespace umbraco.MacroEngines.RazorDataTypeModels /// This ensures that the RTE renders with HtmlString encoding and also ensures that the macro contents in it /// render properly too. /// - [RazorDataTypeModel("5e9b75ae-face-41c8-b47e-5f4b0fd82f83", 90)] + [RazorDataTypeModel(Constants.PropertyEditors.TinyMCEv3, 90)] public class HtmlStringDataTypeModel : IRazorDataTypeModel { public bool Init(int CurrentNodeId, string PropertyData, out object instance) diff --git a/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs b/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs index b597c776b3..d998a7c3ab 100644 --- a/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs +++ b/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Umbraco.Core; namespace umbraco.MacroEngines.RazorDataTypeModels { - [RazorDataTypeModel("1413afcb-d19a-4173-8e9a-68288d2a73b8", 90)] + [RazorDataTypeModel(Constants.PropertyEditors.Integer, 90)] [RazorDataTypeModel("f231cd8a-e447-424a-94a4-bc73b11736bb", 90)] - [RazorDataTypeModel("a52c7c1c-c330-476e-8605-d63d3b84b6a6", 90)] - [RazorDataTypeModel("39f533e4-0551-4505-a64b-e0425c5ce775", 90)] + [RazorDataTypeModel(Constants.PropertyEditors.RadioButtonList, 90)] + [RazorDataTypeModel(Constants.PropertyEditors.MemberPicker, 90)] [RazorDataTypeModel("f6524852-2fb0-11e0-a9fa-6f1cdfd72085", 90)] //Extended Content Picker http://our.umbraco.org/projects/backoffice-extensions/extended-content-picker public class IntegerDataTypeModel : IRazorDataTypeModel { diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs index 13ac75f00c..76c5ce4823 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs @@ -39,10 +39,10 @@ namespace umbraco.MacroEngines #region consts // these are private readonlys as const can't be Guids - private readonly Guid DATATYPE_YESNO_GUID = new Guid("38b352c1-e9f8-4fd8-9324-9a2eab06d97a"); - private readonly Guid DATATYPE_TINYMCE_GUID = new Guid("5e9b75ae-face-41c8-b47e-5f4b0fd82f83"); - private readonly Guid DATATYPE_DATETIMEPICKER_GUID = new Guid("b6fb1622-afa5-4bbf-a3cc-d9672a442222"); - private readonly Guid DATATYPE_DATEPICKER_GUID = new Guid("23e93522-3200-44e2-9f29-e61a6fcbb79a"); + private readonly Guid DATATYPE_YESNO_GUID = new Guid(Constants.PropertyEditors.TrueFalse); + private readonly Guid DATATYPE_TINYMCE_GUID = new Guid(Constants.PropertyEditors.TinyMCEv3); + private readonly Guid DATATYPE_DATETIMEPICKER_GUID = new Guid(Constants.PropertyEditors.DateTime); + private readonly Guid DATATYPE_DATEPICKER_GUID = new Guid(Constants.PropertyEditors.Date); //private readonly Guid DATATYPE_INTEGER_GUID = new Guid("1413afcb-d19a-4173-8e9a-68288d2a73b8"); #endregion diff --git a/src/umbraco.cms/businesslogic/Content.cs b/src/umbraco.cms/businesslogic/Content.cs index 4c7181892a..f5472db429 100644 --- a/src/umbraco.cms/businesslogic/Content.cs +++ b/src/umbraco.cms/businesslogic/Content.cs @@ -565,7 +565,7 @@ namespace umbraco.cms.businesslogic // Remove all files var fs = FileSystemProviderManager.Current.GetFileSystemProvider(); - var uploadField = new Factory().GetNewObject(new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + var uploadField = new Factory().GetNewObject(new Guid(Constants.PropertyEditors.UploadField)); foreach (Property p in GenericProperties) { diff --git a/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs b/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs index 5b1baeb0a8..15d467cf0a 100644 --- a/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs +++ b/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.cms.businesslogic.contentitem { @@ -7,7 +8,7 @@ namespace umbraco.cms.businesslogic.contentitem /// public class ContentItem : Content { - private static Guid _objectType = new Guid("10e2b09f-c28b-476d-b77a-aa686435e44a"); + private static Guid _objectType = new Guid(Constants.ObjectTypes.ContentItem); public ContentItem(int id) : base(id) { diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs index 87b86a8c5f..f5132faed7 100644 --- a/src/umbraco.cms/businesslogic/ContentType.cs +++ b/src/umbraco.cms/businesslogic/ContentType.cs @@ -1089,7 +1089,7 @@ namespace umbraco.cms.businesslogic base.setupNode(); //Try to load the ContentType/MediaType through the new public api - if (nodeObjectType == new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB")) + if (nodeObjectType == new Guid(Constants.ObjectTypes.DocumentType)) { var contentType = ApplicationContext.Current.Services.ContentTypeService.GetContentType(Id); if (contentType != null) @@ -1098,7 +1098,7 @@ namespace umbraco.cms.businesslogic return; } } - else if (nodeObjectType == new Guid("4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E")) + else if (nodeObjectType == new Guid(Constants.ObjectTypes.MediaType)) { var mediaType = ApplicationContext.Current.Services.ContentTypeService.GetMediaType(Id); if (mediaType != null) diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 69b1c5899a..36991f26bd 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -810,7 +810,7 @@ namespace umbraco.cms.businesslogic.packager // Fix for rich text editor backwards compatibility if (dfId == 0 && dtId == new Guid("a3776494-0574-4d93-b7de-efdfdec6f2d1")) { - dtId = new Guid("83722133-f80c-4273-bdb6-1befaa04a612"); + dtId = new Guid(Constants.PropertyEditors.TinyMCE); dfId = findDataTypeDefinitionFromType(ref dtId); } diff --git a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs index 877bd02235..e8699d2ef0 100644 --- a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs +++ b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs @@ -7,6 +7,7 @@ using umbraco.DataLayer; using System.Xml; using umbraco.interfaces; using umbraco.cms.businesslogic.propertytype; +using Umbraco.Core; namespace umbraco.cms.businesslogic.datatype { @@ -23,7 +24,7 @@ namespace umbraco.cms.businesslogic.datatype #region Private fields private Guid _controlId; - private static Guid _objectType = new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"); + private static Guid _objectType = new Guid(Constants.ObjectTypes.DataType); private string _dbType; #endregion diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs index 1969caa1e3..4822b71a51 100644 --- a/src/umbraco.cms/businesslogic/media/Media.cs +++ b/src/umbraco.cms/businesslogic/media/Media.cs @@ -64,7 +64,7 @@ namespace umbraco.cms.businesslogic.media /// /// - /// - public static Guid _objectType = new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c"); + public static Guid _objectType = new Guid(Constants.ObjectTypes.Media); /// /// Creates a new Media diff --git a/src/umbraco.cms/businesslogic/media/MediaType.cs b/src/umbraco.cms/businesslogic/media/MediaType.cs index ee80b3d7b2..f3b41415ed 100644 --- a/src/umbraco.cms/businesslogic/media/MediaType.cs +++ b/src/umbraco.cms/businesslogic/media/MediaType.cs @@ -42,7 +42,7 @@ namespace umbraco.cms.businesslogic.media #region Constants and static members - public static Guid _objectType = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"); + public static Guid _objectType = new Guid(Constants.ObjectTypes.MediaType); #endregion diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs index 94bebaf74a..6a739382ff 100644 --- a/src/umbraco.cms/businesslogic/member/Member.cs +++ b/src/umbraco.cms/businesslogic/member/Member.cs @@ -31,7 +31,7 @@ namespace umbraco.cms.businesslogic.member #region Constants and static members public static readonly string UmbracoMemberProviderName = "UmbracoMembershipProvider"; public static readonly string UmbracoRoleProviderName = "UmbracoRoleProvider"; - public static readonly Guid _objectType = new Guid("39eb0f98-b348-42a1-8662-e7eb18487560"); + public static readonly Guid _objectType = new Guid(Constants.ObjectTypes.Member); private static readonly object m_Locker = new object(); diff --git a/src/umbraco.cms/businesslogic/member/MemberGroup.cs b/src/umbraco.cms/businesslogic/member/MemberGroup.cs index d7f22456ec..ee115558fe 100644 --- a/src/umbraco.cms/businesslogic/member/MemberGroup.cs +++ b/src/umbraco.cms/businesslogic/member/MemberGroup.cs @@ -3,6 +3,7 @@ using System.Data; using umbraco.DataLayer; using System.Collections; using umbraco.cms.businesslogic.web; +using Umbraco.Core; namespace umbraco.cms.businesslogic.member { @@ -15,7 +16,7 @@ namespace umbraco.cms.businesslogic.member /// public class MemberGroup : CMSNode { - private static Guid _objectType = new Guid("366e63b9-880f-4e13-a61c-98069b029728"); + private static Guid _objectType = new Guid(Constants.ObjectTypes.MemberGroup); private string _oldGroupName; /// diff --git a/src/umbraco.cms/businesslogic/member/MemberType.cs b/src/umbraco.cms/businesslogic/member/MemberType.cs index c6ba370986..77e76e6186 100644 --- a/src/umbraco.cms/businesslogic/member/MemberType.cs +++ b/src/umbraco.cms/businesslogic/member/MemberType.cs @@ -3,6 +3,7 @@ using System.Xml; using umbraco.cms.businesslogic.propertytype; using System.Linq; using umbraco.BusinessLogic; +using Umbraco.Core; namespace umbraco.cms.businesslogic.member { @@ -13,8 +14,8 @@ namespace umbraco.cms.businesslogic.member public class MemberType : ContentType { #region Private Members - - private static Guid _objectType = new Guid("9b5416fb-e72f-45a9-a07b-5a9a2709ce43"); + + private static Guid _objectType = new Guid(Constants.ObjectTypes.MemberType); #endregion diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs index ea074ec77c..da119d857b 100644 --- a/src/umbraco.cms/businesslogic/template/Template.cs +++ b/src/umbraco.cms/businesslogic/template/Template.cs @@ -42,7 +42,7 @@ namespace umbraco.cms.businesslogic.template private static object templateCacheSyncLock = new object(); private static readonly string UmbracoTemplateCacheKey = "UmbracoTemplateCache"; private static object _templateLoaderLocker = new object(); - private static Guid _objectType = new Guid("6fbde604-4178-42ce-a10b-8a2600a2f07d"); + private static Guid _objectType = new Guid(Constants.ObjectTypes.Template); private static readonly char[] NewLineChars = Environment.NewLine.ToCharArray(); #endregion diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index 26b818a8de..a99930d999 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -121,7 +121,7 @@ namespace umbraco.cms.businesslogic.web order by level,sortOrder "; - public static Guid _objectType = new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"); + public static Guid _objectType = new Guid(Constants.ObjectTypes.Document); #endregion diff --git a/src/umbraco.cms/businesslogic/web/DocumentType.cs b/src/umbraco.cms/businesslogic/web/DocumentType.cs index 93f3b04aad..2a0de44b2b 100644 --- a/src/umbraco.cms/businesslogic/web/DocumentType.cs +++ b/src/umbraco.cms/businesslogic/web/DocumentType.cs @@ -39,7 +39,7 @@ namespace umbraco.cms.businesslogic.web #region Constants and Static members - public static Guid _objectType = new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"); + public static Guid _objectType = new Guid(Constants.ObjectTypes.DocumentType); new internal const string m_SQLOptimizedGetAll = @" SELECT id, createDate, trashed, parentId, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text, diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs index c14f7ab603..49c593546e 100644 --- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs +++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs @@ -7,6 +7,7 @@ using System.Xml; using umbraco.cms.businesslogic.cache; using umbraco.DataLayer; using umbraco.IO; +using Umbraco.Core; namespace umbraco.cms.businesslogic.web { @@ -19,7 +20,7 @@ namespace umbraco.cms.businesslogic.web private string _filename = ""; private string _content = ""; private StylesheetProperty[] m_properties; - public static Guid ModuleObjectType = new Guid("9f68da4f-a3a8-44c2-8226-dcbd125e4840"); + public static Guid ModuleObjectType = new Guid(Constants.ObjectTypes.Stylesheet); private static object stylesheetCacheSyncLock = new object(); private static readonly string UmbracoStylesheetCacheKey = "UmbracoStylesheet"; diff --git a/src/umbraco.editorControls/SettingControls/Pickers/DocumentType.cs b/src/umbraco.editorControls/SettingControls/Pickers/DocumentType.cs index de75772875..0186fa81ca 100644 --- a/src/umbraco.editorControls/SettingControls/Pickers/DocumentType.cs +++ b/src/umbraco.editorControls/SettingControls/Pickers/DocumentType.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using Umbraco.Core; namespace umbraco.editorControls.SettingControls.Pickers { public class DocumentType: BasePicker { public DocumentType() { - ObjectGuid = new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"); + ObjectGuid = new Guid(Constants.ObjectTypes.DocumentType); } } } \ No newline at end of file diff --git a/src/umbraco.editorControls/SettingControls/Pickers/MediaType.cs b/src/umbraco.editorControls/SettingControls/Pickers/MediaType.cs index 7650b705e1..e43adedb23 100644 --- a/src/umbraco.editorControls/SettingControls/Pickers/MediaType.cs +++ b/src/umbraco.editorControls/SettingControls/Pickers/MediaType.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using Umbraco.Core; namespace umbraco.editorControls.SettingControls.Pickers { @@ -9,7 +10,7 @@ namespace umbraco.editorControls.SettingControls.Pickers { public MediaType() { - ObjectGuid = new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"); + ObjectGuid = new Guid(Constants.ObjectTypes.MediaType); } } } \ No newline at end of file diff --git a/src/umbraco.editorControls/SettingControls/Pickers/MemberGroup.cs b/src/umbraco.editorControls/SettingControls/Pickers/MemberGroup.cs index cf58c3142b..7b91917ec7 100644 --- a/src/umbraco.editorControls/SettingControls/Pickers/MemberGroup.cs +++ b/src/umbraco.editorControls/SettingControls/Pickers/MemberGroup.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using Umbraco.Core; namespace umbraco.editorControls.SettingControls.Pickers { @@ -9,7 +10,7 @@ namespace umbraco.editorControls.SettingControls.Pickers { public MemberGroup() { - ObjectGuid = new Guid("366e63b9-880f-4e13-a61c-98069b029728"); + ObjectGuid = new Guid(Constants.ObjectTypes.MemberGroup); } } } \ No newline at end of file diff --git a/src/umbraco.editorControls/SettingControls/Pickers/MemberType.cs b/src/umbraco.editorControls/SettingControls/Pickers/MemberType.cs index 9054bed6e0..c6f2534888 100644 --- a/src/umbraco.editorControls/SettingControls/Pickers/MemberType.cs +++ b/src/umbraco.editorControls/SettingControls/Pickers/MemberType.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using Umbraco.Core; namespace umbraco.editorControls.SettingControls.Pickers { @@ -9,7 +10,7 @@ namespace umbraco.editorControls.SettingControls.Pickers { public MemberType() { - ObjectGuid = new Guid("9b5416fb-e72f-45a9-a07b-5a9a2709ce43"); + ObjectGuid = new Guid(Constants.ObjectTypes.MemberType); } } } \ No newline at end of file diff --git a/src/umbraco.editorControls/checkboxlist/CheckBoxDataType.cs b/src/umbraco.editorControls/checkboxlist/CheckBoxDataType.cs index e0417f3dac..12519dcd1b 100644 --- a/src/umbraco.editorControls/checkboxlist/CheckBoxDataType.cs +++ b/src/umbraco.editorControls/checkboxlist/CheckBoxDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.checkboxlist { @@ -33,7 +34,7 @@ namespace umbraco.editorControls.checkboxlist public override Guid Id { - get {return new Guid("b4471851-82b6-4c75-afa4-39fa9c6a75e9");} + get {return new Guid(Constants.PropertyEditors.CheckBoxList);} } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/colorpicker/ColorPickerDataType.cs b/src/umbraco.editorControls/colorpicker/ColorPickerDataType.cs index 56115aec36..1bdf605118 100644 --- a/src/umbraco.editorControls/colorpicker/ColorPickerDataType.cs +++ b/src/umbraco.editorControls/colorpicker/ColorPickerDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.colorpicker { @@ -38,7 +39,7 @@ namespace umbraco.editorControls.colorpicker } public override Guid Id { - get {return new Guid("F8D60F68-EC59-4974-B43B-C46EB5677985");} + get { return new Guid(Constants.PropertyEditors.ColorPicker); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/datefieldmultiple/DataTypeDatefieldMultiple.cs b/src/umbraco.editorControls/datefieldmultiple/DataTypeDatefieldMultiple.cs index f2e2d04bcf..b54cfb7a42 100644 --- a/src/umbraco.editorControls/datefieldmultiple/DataTypeDatefieldMultiple.cs +++ b/src/umbraco.editorControls/datefieldmultiple/DataTypeDatefieldMultiple.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.datefieldmultiple { @@ -13,7 +14,7 @@ namespace umbraco.editorControls.datefieldmultiple { get { - return new Guid("B6FB1622-AFA5-4BBF-A3CC-D9672A442222"); + return new Guid(Constants.PropertyEditors.DateTime); } } diff --git a/src/umbraco.editorControls/datepicker/DateDataType.cs b/src/umbraco.editorControls/datepicker/DateDataType.cs index f7d94f0519..8d044d894a 100644 --- a/src/umbraco.editorControls/datepicker/DateDataType.cs +++ b/src/umbraco.editorControls/datepicker/DateDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.datepicker { @@ -43,7 +44,7 @@ namespace umbraco.editorControls.datepicker public override Guid Id { - get {return new Guid("23e93522-3200-44e2-9f29-e61a6fcbb79a");} + get { return new Guid(Constants.PropertyEditors.Date); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/dictionaryPicker/dictionaryPickerDataType.cs b/src/umbraco.editorControls/dictionaryPicker/dictionaryPickerDataType.cs index fc2035f0b0..c0a1fb8cb9 100644 --- a/src/umbraco.editorControls/dictionaryPicker/dictionaryPickerDataType.cs +++ b/src/umbraco.editorControls/dictionaryPicker/dictionaryPickerDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.dictionaryPicker { @@ -35,7 +36,7 @@ namespace umbraco.editorControls.dictionaryPicker get { // TODO: Add dictionaryPickerDataType.Id getter implementation - return new Guid ("17B70066-F764-407d-AB05-3717F1E1C513"); + return new Guid(Constants.PropertyEditors.DictionaryPicker); } } diff --git a/src/umbraco.editorControls/dropdownlist/DropDownDataType.cs b/src/umbraco.editorControls/dropdownlist/DropDownDataType.cs index 27b6efe4f3..56bd43a89f 100644 --- a/src/umbraco.editorControls/dropdownlist/DropDownDataType.cs +++ b/src/umbraco.editorControls/dropdownlist/DropDownDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.dropdownlist { @@ -39,7 +40,7 @@ namespace umbraco.editorControls.dropdownlist public override Guid Id { - get {return new Guid("a74ea9c9-8e18-4d2a-8cf6-73c6206c5da6");} + get { return new Guid(Constants.PropertyEditors.DropDownList); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/dropdownlist/dropDownKeysDataType.cs b/src/umbraco.editorControls/dropdownlist/dropDownKeysDataType.cs index 655441d24f..a4308a031d 100644 --- a/src/umbraco.editorControls/dropdownlist/dropDownKeysDataType.cs +++ b/src/umbraco.editorControls/dropdownlist/dropDownKeysDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.dropdownlist { @@ -39,7 +40,7 @@ namespace umbraco.editorControls.dropdownlist public override Guid Id { - get {return new Guid("a74ea9e1-8e18-4d2a-8cf6-73c6206c5da6");} + get { return new Guid(Constants.PropertyEditors.DropdownlistPublishingKeys); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/folderbrowser/DataTypeFolderbrowser.cs b/src/umbraco.editorControls/folderbrowser/DataTypeFolderbrowser.cs index ac343a8a83..ae24df2aad 100644 --- a/src/umbraco.editorControls/folderbrowser/DataTypeFolderbrowser.cs +++ b/src/umbraco.editorControls/folderbrowser/DataTypeFolderbrowser.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.folderbrowser { @@ -24,7 +25,7 @@ namespace umbraco.editorControls.folderbrowser get { return _baseData ?? (_baseData = new cms.businesslogic.datatype.DefaultData(this)); } } - public override Guid Id { get { return new Guid("CCCD4AE9-F399-4ED2-8038-2E88D19E810C"); } } + public override Guid Id { get { return new Guid(Constants.PropertyEditors.FolderBrowser); } } public override string DataTypeName { get { return "Folder browser"; } } diff --git a/src/umbraco.editorControls/imagecropper/DataType.cs b/src/umbraco.editorControls/imagecropper/DataType.cs index 6dd266de12..f0320dd395 100644 --- a/src/umbraco.editorControls/imagecropper/DataType.cs +++ b/src/umbraco.editorControls/imagecropper/DataType.cs @@ -1,5 +1,6 @@ using System; using System.Reflection; +using Umbraco.Core; namespace umbraco.editorControls.imagecropper { @@ -30,7 +31,7 @@ namespace umbraco.editorControls.imagecropper } public override Guid Id { - get { return new Guid("7A2D436C-34C2-410F-898F-4A23B3D79F54"); } + get { return new Guid(Constants.PropertyEditors.ImageCropper); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/label/DataTypeNoEdit.cs b/src/umbraco.editorControls/label/DataTypeNoEdit.cs index bda9ecaefd..53fd7ac59c 100644 --- a/src/umbraco.editorControls/label/DataTypeNoEdit.cs +++ b/src/umbraco.editorControls/label/DataTypeNoEdit.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.label { @@ -13,7 +14,7 @@ namespace umbraco.editorControls.label private interfaces.IDataPrevalue _prevalueeditor; public override string DataTypeName {get {return "No edit";}} - public override Guid Id {get {return new Guid("6c738306-4c17-4d88-b9bd-6546f3771597");}} + public override Guid Id { get { return new Guid(Constants.PropertyEditors.NoEdit); } } public override interfaces.IDataEditor DataEditor diff --git a/src/umbraco.editorControls/listbox/ListBoxDataType.cs b/src/umbraco.editorControls/listbox/ListBoxDataType.cs index 5c41fdc877..2494ab329d 100644 --- a/src/umbraco.editorControls/listbox/ListBoxDataType.cs +++ b/src/umbraco.editorControls/listbox/ListBoxDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.listbox { @@ -40,7 +41,7 @@ namespace umbraco.editorControls.listbox public override Guid Id { - get {return new Guid("928639ED-9C73-4028-920C-1E55DBB68783");} + get { return new Guid(Constants.PropertyEditors.DropDownListMultiple); } } public override interfaces.IDataPrevalue PrevalueEditor { diff --git a/src/umbraco.editorControls/listbox/ListBoxKeysDataType.cs b/src/umbraco.editorControls/listbox/ListBoxKeysDataType.cs index d63bd2b3e3..ff21619e2a 100644 --- a/src/umbraco.editorControls/listbox/ListBoxKeysDataType.cs +++ b/src/umbraco.editorControls/listbox/ListBoxKeysDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.listbox { @@ -40,7 +41,7 @@ namespace umbraco.editorControls.listbox public override Guid Id { - get {return new Guid("928639AA-9C73-4028-920C-1E55DBB68783");} + get { return new Guid(Constants.PropertyEditors.DropdownlistMultiplePublishKeys); } } public override interfaces.IDataPrevalue PrevalueEditor { diff --git a/src/umbraco.editorControls/macrocontainer/DataType.cs b/src/umbraco.editorControls/macrocontainer/DataType.cs index 55aa799482..763930bee0 100644 --- a/src/umbraco.editorControls/macrocontainer/DataType.cs +++ b/src/umbraco.editorControls/macrocontainer/DataType.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Umbraco.Core; namespace umbraco.editorControls.macrocontainer { @@ -40,7 +41,7 @@ namespace umbraco.editorControls.macrocontainer { get { - return new Guid("474FCFF8-9D2D-11DE-ABC6-AD7A56D89593"); + return new Guid(Constants.PropertyEditors.MacroContainer); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/mediapicker/MediaPickerDataType.cs b/src/umbraco.editorControls/mediapicker/MediaPickerDataType.cs index fac8134eb0..4eac9d1ac7 100644 --- a/src/umbraco.editorControls/mediapicker/MediaPickerDataType.cs +++ b/src/umbraco.editorControls/mediapicker/MediaPickerDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.mediapicker { @@ -38,7 +39,7 @@ namespace umbraco.editorControls.mediapicker { get { - return new Guid ("EAD69342-F06D-4253-83AC-28000225583B"); + return new Guid(Constants.PropertyEditors.MediaPicker); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/memberpicker/MemberPickerDataType.cs b/src/umbraco.editorControls/memberpicker/MemberPickerDataType.cs index 37cf84bc75..052765d877 100644 --- a/src/umbraco.editorControls/memberpicker/MemberPickerDataType.cs +++ b/src/umbraco.editorControls/memberpicker/MemberPickerDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.memberpicker { @@ -37,7 +38,7 @@ namespace umbraco.editorControls.memberpicker public override Guid Id { - get {return new Guid("39F533E4-0551-4505-A64B-E0425C5CE775");} + get { return new Guid(Constants.PropertyEditors.MemberPicker); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/numberfield/DataTypeInteger.cs b/src/umbraco.editorControls/numberfield/DataTypeInteger.cs index 778cfd5d09..728c88cb21 100644 --- a/src/umbraco.editorControls/numberfield/DataTypeInteger.cs +++ b/src/umbraco.editorControls/numberfield/DataTypeInteger.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.numberfield { @@ -23,7 +24,7 @@ namespace umbraco.editorControls.numberfield { get { - return new Guid("1413afcb-d19a-4173-8e9a-68288d2a73b8"); + return new Guid(Constants.PropertyEditors.Integer); } } diff --git a/src/umbraco.editorControls/pagepicker/PagePickerDataType.cs b/src/umbraco.editorControls/pagepicker/PagePickerDataType.cs index 18632cb13e..f250bf13bb 100644 --- a/src/umbraco.editorControls/pagepicker/PagePickerDataType.cs +++ b/src/umbraco.editorControls/pagepicker/PagePickerDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.pagepicker { @@ -36,7 +37,7 @@ namespace umbraco.editorControls.pagepicker { get { - return new Guid ("158AA029-24ED-4948-939E-C3DA209E5FBA"); + return new Guid (Constants.PropertyEditors.ContentPicker); } } diff --git a/src/umbraco.editorControls/radiobuttonlist/RadioButtonListDataType.cs b/src/umbraco.editorControls/radiobuttonlist/RadioButtonListDataType.cs index 9c3e78e540..7c0d9fe708 100644 --- a/src/umbraco.editorControls/radiobuttonlist/RadioButtonListDataType.cs +++ b/src/umbraco.editorControls/radiobuttonlist/RadioButtonListDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.radiobuttonlist { @@ -38,7 +39,7 @@ namespace umbraco.editorControls.radiobuttonlist } public override Guid Id { - get {return new Guid("A52C7C1C-C330-476E-8605-D63D3B84B6A6");} + get { return new Guid(Constants.PropertyEditors.RadioButtonList); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/relatedlinks/RelatedLinksDataType.cs b/src/umbraco.editorControls/relatedlinks/RelatedLinksDataType.cs index 011a848dfb..16b97acad7 100644 --- a/src/umbraco.editorControls/relatedlinks/RelatedLinksDataType.cs +++ b/src/umbraco.editorControls/relatedlinks/RelatedLinksDataType.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Text; +using Umbraco.Core; namespace umbraco.editorControls.relatedlinks { @@ -32,7 +33,7 @@ namespace umbraco.editorControls.relatedlinks } public override Guid Id { - get { return new Guid("71b8ad1a-8dc2-425c-b6b8-faa158075e63"); } + get { return new Guid(Constants.PropertyEditors.RelatedLinks); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/simpleEditor/simpleEditorDataType.cs b/src/umbraco.editorControls/simpleEditor/simpleEditorDataType.cs index e3c9452116..5d9b977132 100644 --- a/src/umbraco.editorControls/simpleEditor/simpleEditorDataType.cs +++ b/src/umbraco.editorControls/simpleEditor/simpleEditorDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.simpleEditor { @@ -32,7 +33,7 @@ namespace umbraco.editorControls.simpleEditor } public override Guid Id { - get {return new Guid("60B7DABF-99CD-41eb-B8E9-4D2E669BBDE9");} + get { return new Guid(Constants.PropertyEditors.UltraSimpleEditor); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/tags/DataType.cs b/src/umbraco.editorControls/tags/DataType.cs index 35a64b98fc..6ec69cdcd6 100644 --- a/src/umbraco.editorControls/tags/DataType.cs +++ b/src/umbraco.editorControls/tags/DataType.cs @@ -1,5 +1,6 @@ using System; using umbraco.interfaces; +using Umbraco.Core; using datatype = umbraco.cms.businesslogic.datatype; namespace umbraco.editorControls.tags @@ -40,7 +41,7 @@ namespace umbraco.editorControls.tags public override Guid Id { - get { return new Guid("4023e540-92f5-11dd-ad8b-0800200c9a66"); } + get { return new Guid(Constants.PropertyEditors.Tags); } } public override IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/textfield/TextFieldDataType.cs b/src/umbraco.editorControls/textfield/TextFieldDataType.cs index 0d6e11be71..ba0a659bd1 100644 --- a/src/umbraco.editorControls/textfield/TextFieldDataType.cs +++ b/src/umbraco.editorControls/textfield/TextFieldDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.textfield { @@ -29,7 +30,7 @@ namespace umbraco.editorControls.textfield } public override Guid Id { - get {return new Guid("ec15c1e5-9d90-422a-aa52-4f7622c63bea");} + get { return new Guid(Constants.PropertyEditors.Textbox); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/textfieldmultiple/textfieldMultipleDataType.cs b/src/umbraco.editorControls/textfieldmultiple/textfieldMultipleDataType.cs index 12a09bbf6e..131d1df44c 100644 --- a/src/umbraco.editorControls/textfieldmultiple/textfieldMultipleDataType.cs +++ b/src/umbraco.editorControls/textfieldmultiple/textfieldMultipleDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.textfieldmultiple { @@ -35,7 +36,7 @@ namespace umbraco.editorControls.textfieldmultiple } public override Guid Id { - get {return new Guid("67db8357-ef57-493e-91ac-936d305e0f2a");} + get { return new Guid(Constants.PropertyEditors.TextboxMultiple); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataType.cs b/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataType.cs index c3185d6ec6..674fb151c1 100644 --- a/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataType.cs +++ b/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataType.cs @@ -7,6 +7,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; +using Umbraco.Core; namespace umbraco.editorControls.ultimatepicker { @@ -37,7 +38,7 @@ namespace umbraco.editorControls.ultimatepicker } public override Guid Id { - get { return new Guid("cdbf0b5d-5cb2-445f-bc12-fcaaec07cf2c"); } + get { return new Guid(Constants.PropertyEditors.UltimatePicker); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/uploadfield/DataTypeUploadField.cs b/src/umbraco.editorControls/uploadfield/DataTypeUploadField.cs index 8d5104094c..81b140744b 100644 --- a/src/umbraco.editorControls/uploadfield/DataTypeUploadField.cs +++ b/src/umbraco.editorControls/uploadfield/DataTypeUploadField.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.uploadfield { @@ -44,7 +45,7 @@ namespace umbraco.editorControls.uploadfield public override Guid Id { - get {return new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c");} + get { return new Guid(Constants.PropertyEditors.UploadField); } } public override interfaces.IDataPrevalue PrevalueEditor diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolDataType.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolDataType.cs index 45fcd2047b..d4e3c775de 100644 --- a/src/umbraco.editorControls/userControlWrapper/usercontrolDataType.cs +++ b/src/umbraco.editorControls/userControlWrapper/usercontrolDataType.cs @@ -7,6 +7,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; +using Umbraco.Core; namespace umbraco.editorControls.userControlGrapper { @@ -37,7 +38,7 @@ namespace umbraco.editorControls.userControlGrapper } public override Guid Id { - get { return new Guid("D15E1281-E456-4b24-AA86-1DDA3E4299D5"); } + get { return new Guid(Constants.PropertyEditors.UmbracoUserControlWrapper); } } public override string DataTypeName diff --git a/src/umbraco.editorControls/yesno/YesNoDataType.cs b/src/umbraco.editorControls/yesno/YesNoDataType.cs index f9541da3ba..abe014b9ac 100644 --- a/src/umbraco.editorControls/yesno/YesNoDataType.cs +++ b/src/umbraco.editorControls/yesno/YesNoDataType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Core; namespace umbraco.editorControls.yesno { @@ -37,7 +38,7 @@ namespace umbraco.editorControls.yesno } public override Guid Id { - get {return new Guid("38b352c1-e9f8-4fd8-9324-9a2eab06d97a");} + get {return new Guid(Constants.PropertyEditors.TrueFalse);} }