From a12d736b6bb61e2d837562d93b06dc1a8e8aec3a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 18 Oct 2018 14:56:00 +0200
Subject: [PATCH] show user in version dropdown

---
 .../common/infiniteeditors/rollback/rollback.controller.js   | 5 ++++-
 .../src/views/common/infiniteeditors/rollback/rollback.html  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index 2aa628d5ef..f96c1f6a3d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -79,7 +79,10 @@
 
             return contentResource.getRollbackVersions(nodeId, culture)
                 .then(function(data){
-                    vm.previousVersions = data;
+                    vm.previousVersions = data.map(version => {
+                        version.displayValue = version.versionDate + " - " + version.versionAuthorName;
+                        return version;
+                    }); 
                 });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
index 8c6c1f6de5..5faba3a3ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -38,7 +38,7 @@
                         <select 
                             class="input-block-level"
                             ng-model="vm.selectedVersion"
-                            ng-options="version.versionDate for version in vm.previousVersions track by version.versionId"
+                            ng-options="version.displayValue for version in vm.previousVersions track by version.versionId"
                             ng-change="vm.changeVersion(vm.selectedVersion)">
                             <option value=""><localize key="general_choose">Choose</localize>...</option>
                         </select>