diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
index 1ccbd355b..130a97c1c 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
@@ -22,6 +22,7 @@ export interface IMovieRequests extends IFullBaseRequest {
denied4K: boolean;
deniedReason4K: string;
requestedDate4k: Date;
+ requestedDate: Date;
// For the UI
rootPathOverrideTitle: string;
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 b3283bb73..984994016 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
@@ -142,10 +142,20 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
this.ref.detectChanges();
};
- const data = { request: request, filter: filter, onChange: onChange, manageOwnRequests: this.manageOwnRequests, isAdmin: this.isAdmin, has4kRequest: request.has4KRequest };
+ const data = { request: request, filter: filter, onChange: onChange, manageOwnRequests: this.manageOwnRequests, isAdmin: this.isAdmin, has4kRequest: request.has4KRequest, hasRegularRequest: this.checkDate(request.requestedDate) };
this.onOpenOptions.emit(data);
}
+ private checkDate(date: Date|string): boolean {
+ if (date instanceof String) {
+ return new Date(date).getFullYear() > 1;
+ }
+ if (date instanceof Date) {
+ return date.getFullYear() > 1;
+ }
+ return false;
+ }
+
public switchFilter(type: RequestFilterType) {
this.currentFilter = type;
this.ngAfterViewInit();
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
index b584cc0c5..72c0cdce3 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
@@ -2,10 +2,10 @@
{{'Requests.RequestPanel.Delete' | translate}}
-
+
{{'Requests.RequestPanel.Approve' | translate}}
-
+
{{'Requests.RequestPanel.Approve4K' | translate}}
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
index a37680bc2..673f978e7 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
@@ -63,6 +63,8 @@ export class RequestOptionsComponent {
}
await firstValueFrom(this.requestService.approveMovie({id: this.data.id, is4K: true}));
+ this.bottomSheetRef.dismiss({type: UpdateType.Approve});
+ return;
}
public async changeAvailability() {