Fixes issue #7, duplicate relations with bidirectional relation types.

Author: lars-erik

Umbraco.RelationEditor.Web/App_Plugins/RelationEditor/editrelations.html

@@ -21,7 +21,12 @@ <h4>{{resourceSet.Name}}</h4>
                             <td style="width:5%;" class="direction"></td>
                             <td style="width:15%;">{{relation.ChildId}}</td>
                             <td style="width:70%;" title="{{relation.FullPath}}">{{relation.ChildName}}</td>
-                            <td style="width:10%;"><button class="btn btn-danger" ng-click="remove(relation)">Remove</button></td>
+                            <td style="width:10%;">
+                                <button class="btn btn-danger" ng-click="remove(relation)" ng-disabled="relation.Readonly"
+                                    title="{{relation.RemoveTitle}}">
+                                    Remove
+                                </button>
+                            </td>
                         </tr>
                     </tbody>
                     <tfoot>

Umbraco.RelationEditor.Web/App_Plugins/RelationEditor/relationeditor.js

@@ -104,6 +104,13 @@
 
         var promise = relationsResources.getById($scope.currentNode.section, $scope.currentNode.nodeType, $scope.currentNode.id);
         promise.then(function (data) {
+            $(data).each(function (i, type) {
+                $(type.Sets).each(function (i2, set) {
+                    $(set.Relations).each(function(i3, relation) {
+                        relation.RemoveTitle = relation.Readonly ? "Must be removed from " + relation.ChildName : "Remove relation";
+                    });
+                });
+            });
             $scope.data = data;
             $scope.resourceSets = data.Sets;
             $scope.ready = true;

Umbraco.RelationEditor.Web/Web.config

@@ -35,7 +35,7 @@
       Umbraco web.config configuration documentation can be found here: 
       http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig
       -->
-    <add key="umbracoConfigurationStatus" value="7.1.3" />
+    <add key="umbracoConfigurationStatus" value="7.1.2" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoPath" value="~/umbraco" />

Umbraco.RelationEditor.Web/config/ClientDependency.config

@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="240058734" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="652114428" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.

Umbraco.RelationEditor.Web/config/RelationEditor.config

@@ -13,12 +13,6 @@
       <EnabledChildType Alias="Image" />
     </EnabledRelation>
   </ObjectType>
-  <ObjectType Alias="page" Name="Document">
-    <EnabledRelation Alias="documentRelation">
-      <EnabledChildType Alias="page" />
-    </EnabledRelation>
-    <EnabledRelation Alias="docToDocType" />
-  </ObjectType>
   <ObjectType Alias="page" Name="Document">
     <EnabledRelation Alias="documentRelation">
       <EnabledChildType Alias="page" />
@@ -31,4 +25,16 @@
     </EnabledRelation>
     <EnabledRelation Alias="docToDocType" />
   </ObjectType>
+  <ObjectType Alias="page" Name="Document">
+    <EnabledRelation Alias="documentRelation">
+      <EnabledChildType Alias="page" />
+    </EnabledRelation>
+    <EnabledRelation Alias="docToDocType" />
+  </ObjectType>
+  <ObjectType Alias="post" Name="Document">
+    <EnabledRelation Alias="documentRelation">
+      <EnabledChildType Alias="page" />
+      <EnabledChildType Alias="post" />
+    </EnabledRelation>
+  </ObjectType>
 </RelationEditor>

Umbraco.RelationEditor/Controllers/RelationsController.cs

@@ -83,7 +83,8 @@ int parentId
                         {
                             int otherId;
                             Guid relatedType;
-                            if (r.ParentId == parentId)
+                            var isParent = r.ParentId == parentId;
+                            if (isParent)
                             {
                                 otherId = r.ChildId;
                                 relatedType = rt.ChildObjectType;
@@ -98,7 +99,8 @@ int parentId
                             var fullPath = GetFullPath(relEntity);
                             return new RelationDto
                             {
-                                ChildId = otherId,
+                                Readonly = !isParent,
+                                ChildId = r.ChildId,
                                 FullPath = HttpContext.Current.Server.HtmlEncode(fullPath),
                                 ChildName = (configuration.BreadcrumbMode == BreadcrumbMode.ToolTip) ? otherName : HttpContext.Current.Server.HtmlDecode(fullPath),
                                 State = RelationStateEnum.Unmodified
@@ -134,7 +136,7 @@ public void SaveRelations(ContentRelationsDto contentRelations)
 
                 foreach (var relation in set.Relations)
                 {
-                    if (relation.State == RelationStateEnum.Deleted)
+                    if (relation.State == RelationStateEnum.Deleted || relation.Readonly)
                         continue;
 
                     var childEntity = entityService.Get(relation.ChildId, UmbracoObjectTypesExtensions.GetUmbracoObjectType(type.ChildObjectType));
@@ -234,6 +236,7 @@ public class RelationDto
         public string FullPath { get; set; }
         public RelationStateEnum State { get; set; }
         public bool Deleted { get; set; }
+        public bool Readonly { get; set; }
 
         public RelationDto()
         {