From 0069bfdf54e0785bad45c832ca052f19fd4b940b Mon Sep 17 00:00:00 2001 From: sephrat <34862846+sephrat@users.noreply.github.com> Date: Sat, 15 Apr 2023 21:54:39 +0200 Subject: [PATCH] fix: Fix denied movie shown as 'processing request' in details view (#4900) --- .../movie-information-panel.component.html | 13 +--------- .../movie-information-panel.component.ts | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html index 4596f2c01..db6a78b5a 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html @@ -36,18 +36,7 @@
{{'MediaDetails.RequestStatus' | translate }} -
-
{{'Common.RequestDenied' | translate}}
-
{{'Common.ProcessingRequest' | translate}}
-
{{'Common.PendingApproval' | translate}}
- -
-
-
{{'Common.RequestDenied4K' | translate}}
-
{{'Common.ProcessingRequest4K' | translate}}
-
{{'Common.PendingApproval4K' | translate}}
- -
+
{{getStatus(movie) | translate}}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts index ade256a82..4838dff51 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts @@ -34,4 +34,28 @@ export class MovieInformationPanelComponent implements OnInit { this.searchService.getMovieStreams(this.movie.id).subscribe(x => this.streams = x); } + + public getStatus(movie: ISearchMovieResultV2) { + if (!movie.available && movie.requested) { + if (movie.denied) { + return "Common.RequestDenied"; + } + if (movie.approved) { + return "Common.ProcessingRequest"; + } else { + return "Common.PendingApproval"; + } + } + + if (!movie.available4K && movie.has4KRequest) { + if (movie.denied4K) { + return "Common.RequestDenied4K"; + } + if (movie.approved4K) { + return "Common.ProcessingRequest4K"; + } else { + return "Common.PendingApproval4K"; + } + } + } }