From 4876108f712efb24a6545c56ad742714948321f1 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <niko737@edu.ucl.dk>
Date: Wed, 27 Oct 2021 09:49:05 +0200
Subject: [PATCH 1/2] change button to user editUser function

---
 .../src/views/common/overlays/user/user.controller.js      | 6 ++++++
 .../src/views/common/overlays/user/user.html               | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
index 28dcedd67705..a98eacd70246 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
@@ -182,6 +182,12 @@ angular.module("umbraco")
            $scope.changePasswordModel.value.confirm = "";
         }
 
+        $scope.editUser = function()  {
+          $location
+            .path('/users/users/user/' + $scope.user.id);
+          $scope.model.close();
+        }
+
         dashboardResource.getDashboard("user-dialog").then(function (dashboard) {
             $scope.dashboard = dashboard;
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 8f2627795f7c..c722424e3182 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -11,9 +11,8 @@ <h5><localize key="user_yourProfile"></localize></h5>
 
         <umb-button
             alias="editUser"
-            type="link"
-            href="#/users/users/user/{{user.id}}"
-            action="model.close()"
+            type="button"
+            action="editUser()"
             button-style="action"
             label="Edit"
             label-key="general_edit"
@@ -75,7 +74,7 @@ <h5>
                     <localize key="defaultdialogs_unLinkYour">Un-link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
                 </button>
             </div>
-            
+
         </div>
 
     </div>

From 439e1b55964dd52871d6bfd84730989d63b75265 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <niko737@edu.ucl.dk>
Date: Wed, 3 Nov 2021 14:15:36 +0100
Subject: [PATCH 2/2] Updated User after merge

---
 .../src/views/common/overlays/user/user.html                 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index b926d9e26681..fa857858687c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -6,14 +6,13 @@ <h5>
     </h5>
 
     <umb-button
-      action="model.close()"
+      action="editUser()"
       alias="editUser"
       button-style="action"
-      href="#/users/users/user/{{user.id}}"
       label="Edit"
       label-key="general_edit"
       ng-if="canEditProfile"
-      type="link">
+      type="button">
     </umb-button>
 
     <umb-button