github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(requests): 🐛 Fixed the approve 4k option on the requests list not working as expected

Browse source
This commit is contained in:
tidusjar 2022-02-16 16:30:42 +00:00
commit c0189dad47
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
View file

@ -22,6 +22,7 @@ export interface IMovieRequests extends IFullBaseRequest {
denied4K: boolean; denied4K: boolean;
deniedReason4K: string; deniedReason4K: string;
requestedDate4k: Date; requestedDate4k: Date;
requestedDate: Date;
// For the UI // For the UI
rootPathOverrideTitle: string; rootPathOverrideTitle: string;

12
src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
View file

@ -142,10 +142,20 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
this.ref.detectChanges(); 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); 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) { public switchFilter(type: RequestFilterType) {
this.currentFilter = type; this.currentFilter = type;
this.ngAfterViewInit(); this.ngAfterViewInit();

4
src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
View file

@ -2,10 +2,10 @@
<a id="requestDelete" *ngIf="data.isAdmin || data.manageOwnRequests" (click)="delete()" mat-list-item> <a id="requestDelete" *ngIf="data.isAdmin || data.manageOwnRequests" (click)="delete()" mat-list-item>
<span mat-line>{{'Requests.RequestPanel.Delete' | translate}}</span> <span mat-line>{{'Requests.RequestPanel.Delete' | translate}}</span>
</a> </a>
<a id="requestApprove" *ngIf="data.canApprove && data.isAdmin" (click)="approve()" mat-list-item> <a id="requestApprove" *ngIf="data.canApprove && data.hasRegularRequest && data.isAdmin" (click)="approve()" mat-list-item>
<span mat-line>{{'Requests.RequestPanel.Approve' | translate}}</span> <span mat-line>{{'Requests.RequestPanel.Approve' | translate}}</span>
</a> </a>
<a id="requestApprove4k" *ngIf="data.canApprove && data.isAdmin && data.has4kRequest" (click)="approve4k()" mat-list-item> <a id="requestApprove4k" *ngIf="data.canApprove && data.isAdmin && data.has4kRequest ?? false" (click)="approve4K()" mat-list-item>
<span mat-line>{{'Requests.RequestPanel.Approve4K' | translate}}</span> <span mat-line>{{'Requests.RequestPanel.Approve4K' | translate}}</span>
</a> </a>
<a id="requestChangeAvailability" *ngIf="data.type !== RequestType.tvShow && data.isAdmin" (click)="changeAvailability()" mat-list-item> <a id="requestChangeAvailability" *ngIf="data.type !== RequestType.tvShow && data.isAdmin" (click)="changeAvailability()" mat-list-item>

2
src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
View file

@ -63,6 +63,8 @@ export class RequestOptionsComponent {
} }
await firstValueFrom(this.requestService.approveMovie({id: this.data.id, is4K: true})); await firstValueFrom(this.requestService.approveMovie({id: this.data.id, is4K: true}));
this.bottomSheetRef.dismiss({type: UpdateType.Approve});
return;
} }
public async changeAvailability() { public async changeAvailability() {