From d019ba81f3ba8aae56e9350c4059159db1d0cdc6 Mon Sep 17 00:00:00 2001
From: James Coxhead <jamescoxhead@users.noreply.github.com>
Date: Thu, 15 Nov 2018 22:34:43 +0000
Subject: [PATCH] Get relation names

---
 .../src/views/relationtypes/edit.controller.js   | 16 +++++++++++++++-
 .../src/views/relationtypes/edit.html            |  4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
index 290117850c..11e8321350 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js
@@ -1,4 +1,4 @@
-function RelationTypeEditController($scope, $routeParams, relationTypeResource, editorState, navigationService, dateHelper, userService) {
+function RelationTypeEditController($scope, $routeParams, relationTypeResource, editorState, navigationService, dateHelper, userService, entityResource) {
 
     var vm = this;
 
@@ -23,6 +23,7 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
                 });
 
                 formatDates(vm.relationType.relations);
+                getRelationNames(vm.relationType);
 
                 vm.page.loading = false;
             });
@@ -37,6 +38,19 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
             });
         }
     }
+
+    function getRelationNames(relationType) {
+        if(relationType.relations) {
+            angular.forEach(relationType.relations, function(relation){
+                entityResource.getById(relation.parentId, relationType.parentObjectTypeName).then(function(entity) {
+                    relation.parentName = entity.name;
+                });
+                entityResource.getById(relation.childId, relationType.childObjectTypeName).then(function(entity) {
+                    relation.childName = entity.name;
+                });
+            });
+        }
+    }
 }
 
 angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.EditController", RelationTypeEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html
index c822c90a15..1a1bcfe6c9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html
@@ -61,8 +61,8 @@
                                         <th>Comment</th>
                                     </thead>
                                     <tr ng-repeat="relation in vm.relationType.relations">
-                                        <td>{{relation.parentId}}</td>
-                                        <td>{{relation.childId}}</td>
+                                        <td>{{relation.parentName}}</td>
+                                        <td>{{relation.childName}}</td>
                                         <td>{{relation.timestampFormatted}}</td>
                                         <td>{{relation.comment}}</td>
                                     </tr>