From cd1a4c4749a8343d2accb14f46e9386b2306f05a Mon Sep 17 00:00:00 2001 From: lepipele Date: Thu, 19 Apr 2018 11:44:24 -0500 Subject: [PATCH] Fixing modify user page and it's title --- BTCPayServer/Controllers/ServerController.cs | 1 + BTCPayServer/Views/Server/ServerNavPages.cs | 4 ++-- BTCPayServer/Views/Server/User.cshtml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BTCPayServer/Controllers/ServerController.cs b/BTCPayServer/Controllers/ServerController.cs index 180bc8af0..b13839ab7 100644 --- a/BTCPayServer/Controllers/ServerController.cs +++ b/BTCPayServer/Controllers/ServerController.cs @@ -132,6 +132,7 @@ namespace BTCPayServer.Controllers var roles = await _UserManager.GetRolesAsync(user); var userVM = new UserViewModel(); userVM.Id = user.Id; + userVM.Email = user.Email; userVM.IsAdmin = IsAdmin(roles); return View(userVM); } diff --git a/BTCPayServer/Views/Server/ServerNavPages.cs b/BTCPayServer/Views/Server/ServerNavPages.cs index c0023715e..9a51cbc0c 100644 --- a/BTCPayServer/Views/Server/ServerNavPages.cs +++ b/BTCPayServer/Views/Server/ServerNavPages.cs @@ -15,9 +15,9 @@ namespace BTCPayServer.Views.Server } public const string ACTIVE_PAGE_KEY = "ActivePage"; - public static void SetActivePageAndTitle(this ViewDataDictionary viewData, Pages activePage, string titleOverride = null) + public static void SetActivePageAndTitle(this ViewDataDictionary viewData, Pages activePage) { - viewData["Title"] = titleOverride ?? activePage.ToString(); + viewData["Title"] = activePage.ToString(); viewData[ACTIVE_PAGE_KEY] = activePage; } diff --git a/BTCPayServer/Views/Server/User.cshtml b/BTCPayServer/Views/Server/User.cshtml index 81559e81f..970edb8bc 100644 --- a/BTCPayServer/Views/Server/User.cshtml +++ b/BTCPayServer/Views/Server/User.cshtml @@ -1,10 +1,10 @@ @model UserViewModel @{ - ViewData.SetActivePageAndTitle(ServerNavPages.Pages.Users, Model.Email); + ViewData.SetActivePageAndTitle(ServerNavPages.Pages.Users); } -

@ViewData["Title"]

+

Modify User - @Model.Email

@Html.Partial("_StatusMessage", Model.StatusMessage)