From 02281a0ee2bb78b630f011f95dfa472ee46c8d7a Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Thu, 7 Feb 2019 17:44:59 +0100 Subject: [PATCH] Add "back to list" button on edit user --- .../src/views/users/overview.controller.js | 12 ++---------- .../src/views/users/user.controller.js | 1 + src/Umbraco.Web.UI.Client/src/views/users/user.html | 4 +++- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js index 2268bb93b8..91c6d8acb1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js @@ -14,19 +14,17 @@ vm.page.navigation = []; function onInit() { - loadNavigation(); - - setPageName(); } function loadNavigation() { - var labels = ["sections_users", "general_groups"]; + var labels = ["sections_users", "general_groups", "user_userManagement"]; localizationService.localizeMany(labels).then(function (data) { vm.page.labels.users = data[0]; vm.page.labels.groups = data[1]; + vm.page.name = data[2]; vm.page.navigation = [ { @@ -53,12 +51,6 @@ }); } - function setPageName() { - localizationService.localize("user_userManagement").then(function (data) { - vm.page.name = data; - }) - } - onInit(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js index d5636c5b3f..4fe98af04d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js @@ -11,6 +11,7 @@ changePassword: null }; vm.breadcrumbs = []; + vm.showBackButton = true; vm.avatarFile = {}; vm.labels = {}; vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB"; diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html index 3af5cc064a..39e0519ad6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html @@ -10,7 +10,9 @@ hide-icon="true" hide-description="true" hide-alias="true" - navigation="vm.user.navigation"> + navigation="vm.user.navigation" + on-back="vm.goToPage(vm.breadcrumbs[0])" + show-back-button="vm.showBackButton">