From 50b6eb602940a59046386fb4b1b3da109326576e Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Tue, 16 Nov 2021 14:14:46 +0300 Subject: [PATCH] Upgrade admin side to ABP 5.0.0-beta.3 --- .../Components/UserPicker/UserPicker.razor.cs | 4 +- .../EventHub.Admin.Web.csproj | 4 +- .../Menus/EventHubMenuContributor.cs | 7 +- .../Pages/AttendeeDetail.razor | 2 +- .../Pages/AttendeeDetail.razor.cs | 4 +- .../Pages/EventManagement.razor | 2 +- .../Pages/EventManagement.razor.cs | 10 +- .../Pages/OrganizationManagement.razor | 2 +- .../Pages/OrganizationManagement.razor.cs | 10 +- src/EventHub.Admin.Web/wwwroot/global.css | 1754 +---------------- src/EventHub.Admin.Web/wwwroot/global.js | 196 +- src/EventHub.Admin.Web/wwwroot/index.html | 4 +- 12 files changed, 38 insertions(+), 1961 deletions(-) diff --git a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs index 433534a..706e038 100644 --- a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs +++ b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs @@ -92,8 +92,8 @@ namespace EventHub.Admin.Web.Components.UserPicker private async Task OnDataGridReadAsync(DataGridReadDataEventArgs e) { CurrentSorting = e.Columns - .Where(c => c.Direction != SortDirection.None) - .Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : "")) + .Where(c => c.SortDirection != SortDirection.None) + .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : "")) .JoinAsString(","); CurrentPage = e.Page - 1; diff --git a/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj b/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj index 53bfa49..7f955f5 100644 --- a/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj +++ b/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/EventHub.Admin.Web/Menus/EventHubMenuContributor.cs b/src/EventHub.Admin.Web/Menus/EventHubMenuContributor.cs index e89196a..921d882 100644 --- a/src/EventHub.Admin.Web/Menus/EventHubMenuContributor.cs +++ b/src/EventHub.Admin.Web/Menus/EventHubMenuContributor.cs @@ -4,7 +4,6 @@ using EventHub.Admin.Permissions; using EventHub.Localization; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Localization; using Volo.Abp.Account.Localization; using Volo.Abp.Authorization.Permissions; using Volo.Abp.UI.Navigation; @@ -33,7 +32,7 @@ namespace EventHub.Admin.Web.Menus } } - private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) + private Task ConfigureMainMenuAsync(MenuConfigurationContext context) { var l = context.GetLocalizer(); @@ -68,6 +67,8 @@ namespace EventHub.Admin.Web.Menus url: "/events" ).RequirePermissions(EventHubPermissions.Events.Default) ); + + return Task.CompletedTask; } private Task ConfigureUserMenuAsync(MenuConfigurationContext context) @@ -81,7 +82,7 @@ namespace EventHub.Admin.Web.Menus { context.Menu.AddItem(new ApplicationMenuItem( "Account.Manage", - accountStringLocalizer["ManageYourProfile"], + accountStringLocalizer["Manage"], $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}", icon: "fa fa-cog", order: 1000, diff --git a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor index c9061d4..392c2f4 100644 --- a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor +++ b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor @@ -11,7 +11,7 @@

@L["Attendees"]

- + @if (CanAddAttendee) {