From 4041840523b69661e119d48e9f244a4b0aa72e98 Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Thu, 18 Jun 2020 23:17:10 +0100 Subject: [PATCH] fixed the request list paging --- src/Ombi.Core/Engine/Interfaces/BaseEngine.cs | 3 ++- src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs | 1 - src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs | 2 +- .../components/albums-grid/albums-grid.component.ts | 2 +- .../components/movies-grid/movies-grid.component.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs index 81f35383a..8ddf27656 100644 --- a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs +++ b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs @@ -29,7 +29,8 @@ namespace Ombi.Core.Engine.Interfaces private OmbiUser _user; protected async Task GetUser() { - return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName == Username)); + var username = Username.ToUpper(); + return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username)); } protected async Task UserAlias() diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs index 491ff3363..6fc54afcd 100644 --- a/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs +++ b/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs @@ -75,7 +75,6 @@ namespace Ombi.Schedule.Jobs.Emby await CacheEpisodes(server); } - await _notification.Clients.Clients(NotificationHub.AdminConnectionIds) .SendAsync(NotificationHub.NotificationEvent, "Emby Episode Sync Finished"); await OmbiQuartz.TriggerJob(nameof(IRefreshMetadata), "System"); diff --git a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs index 7ecea31c8..0a90d2c5f 100644 --- a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs +++ b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs @@ -70,7 +70,7 @@ namespace Ombi.Schedule.Jobs.Ombi { await StartEmby(embySettings); - await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby"); + await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby"); } } catch (Exception e) diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts index 4a9c3d0d7..633ddf1c2 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts +++ b/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts @@ -74,7 +74,7 @@ export class AlbumsGridComponent implements OnInit, AfterViewInit { this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0); this.paginator.showFirstLastButtons = true; - merge(this.sort.sortChange, this.paginator.page, this.currentFilter) + merge(this.sort.sortChange, this.paginator.page) .pipe( startWith({}), switchMap((value: any) => { diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts index 5d7372de6..93cf37a64 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts +++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts @@ -74,7 +74,7 @@ export class MoviesGridComponent implements OnInit, AfterViewInit { this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0); this.paginator.showFirstLastButtons = true; - merge(this.sort.sortChange, this.paginator.page, this.currentFilter) + merge(this.sort.sortChange, this.paginator.page) .pipe( startWith({}), switchMap((value: any) => {