diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index 5f5201a049..bdbd46e0cb 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -281,22 +281,6 @@ namespace Umbraco.Core
public const string AllMembersListId = "all-members";
}
- ///
- /// Defines the alias identifiers for the built-in Umbraco relation types
- ///
- public static class Relations
- {
- ///
- /// Relation type alias for relating a document on the copy event
- ///
- public const string RelateDocumentOnCopy = "relateDocumentOnCopy";
-
- ///
- /// Relation type alias for relating a document to its parent document on delete
- ///
- public const string RelateParentDocumentOnDelete = "relateParentDocumentOnDelete";
- }
-
///
/// Constants for Umbraco URLs/Querystrings.
///
@@ -309,7 +293,7 @@ namespace Umbraco.Core
}
///
- /// Defines the alias identifiers for Umbraco relation types.
+ /// Defines the alias identifiers for built-in Umbraco relation types.
///
public static class RelationTypes
{
@@ -322,6 +306,16 @@ namespace Umbraco.Core
/// ContentType alias for default relation type "Relate Document On Copy".
///
public const string RelateDocumentOnCopyAlias = "relateDocumentOnCopy";
+
+ ///
+ /// ContentType name for default relation type "Relate Parent Document On Delete".
+ ///
+ public const string RelateParentDocumentOnDeleteName = "Relate Parent Document On Delete";
+
+ ///
+ /// ContentType alias for default relation type "Relate Parent Document On Delete".
+ ///
+ public const string RelateParentDocumentOnDeleteAlias = "relateParentDocumentOnDelete";
}
}
}
diff --git a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
index 62a27e9506..5748fb7eff 100644
--- a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Models.Rdbms
internal class RelationTypeDto
{
[Column("id")]
- [PrimaryKeyColumn(IdentitySeed = 2)]
+ [PrimaryKeyColumn(IdentitySeed = 3)]
public int Id { get; set; }
[Column("dual")]
diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
index 0b2e360467..cb9408b218 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
@@ -268,7 +268,8 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
private void CreateUmbracoRelationTypeData()
{
- _database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Id = 1, Alias = Constants.Conventions.Relations.RelateDocumentOnCopy, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = true, Name = "Relate Document On Copy" });
+ _database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Id = 1, Alias = Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = true, Name = Constants.Conventions.RelationTypes.RelateDocumentOnCopyName });
+ _database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName });
}
private void CreateCmsTaskTypeData()
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs
index 9268ff4af3..e46085897b 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
public static string AddRelationType(Database database)
{
- database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Id = 2, Alias = Constants.Conventions.Relations.RelateParentDocumentOnDelete, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = "Relate Parent Document On Delete" });
+ database.Insert("umbracoRelationType", "id", false, new RelationTypeDto { Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = new Guid(Constants.ObjectTypes.Document), ParentObjectType = new Guid(Constants.ObjectTypes.Document), Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName });
return string.Empty;
}