From 139871f218812a15f742aa66408db12704e0b9b5 Mon Sep 17 00:00:00 2001 From: Alex Zoitos Date: Tue, 1 Dec 2020 02:21:51 -0500 Subject: [PATCH] fix(frontend): canceled movie request should set parent movie status back to unknown (#198) --- server/entity/MediaRequest.ts | 10 +++++----- src/components/RequestModal/MovieRequestModal.tsx | 2 +- src/components/TitleCard/index.tsx | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/entity/MediaRequest.ts b/server/entity/MediaRequest.ts index 8ae56dbf..6c42fad0 100644 --- a/server/entity/MediaRequest.ts +++ b/server/entity/MediaRequest.ts @@ -163,16 +163,16 @@ export class MediaRequest { } const seasonRequestRepository = getRepository(SeasonRequest); if (this.status === MediaRequestStatus.APPROVED) { - this.media.status = MediaStatus.PROCESSING; - mediaRepository.save(this.media); + media.status = MediaStatus.PROCESSING; + mediaRepository.save(media); } if ( this.media.mediaType === MediaType.MOVIE && this.status === MediaRequestStatus.DECLINED ) { - this.media.status = MediaStatus.UNKNOWN; - mediaRepository.save(this.media); + media.status = MediaStatus.UNKNOWN; + mediaRepository.save(media); } /** @@ -213,7 +213,7 @@ export class MediaRequest { }); if (!fullMedia.requests || fullMedia.requests.length === 0) { fullMedia.status = MediaStatus.UNKNOWN; - mediaRepository.save(this.media); + mediaRepository.save(fullMedia); } } diff --git a/src/components/RequestModal/MovieRequestModal.tsx b/src/components/RequestModal/MovieRequestModal.tsx index eb5cdb1d..3b5b0272 100644 --- a/src/components/RequestModal/MovieRequestModal.tsx +++ b/src/components/RequestModal/MovieRequestModal.tsx @@ -99,7 +99,7 @@ const MovieRequestModal: React.FC = ({ } addToast( - {intl.formatMessage(messages.cancelrequest, { + {intl.formatMessage(messages.requestCancel, { title: data?.title, strong: function strong(msg) { return {msg}; diff --git a/src/components/TitleCard/index.tsx b/src/components/TitleCard/index.tsx index d70f220e..4b1022c5 100644 --- a/src/components/TitleCard/index.tsx +++ b/src/components/TitleCard/index.tsx @@ -209,7 +209,8 @@ const TitleCard: React.FC = ({ - {!currentStatus && ( + {(!currentStatus || + currentStatus === MediaStatus.UNKNOWN) && (