github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/v4' of https://github.com/tidusjar/Ombi into feature/v4

Browse source
This commit is contained in:
tidusjar 2019-07-10 22:45:25 +01:00
commit 723aa3fffc
3 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Ombi.Store/Entities/Requests/MovieRequests.cs
View file

@ -33,5 +33,28 @@ namespace Ombi.Store.Entities.Requests
[NotMapped]
[JsonIgnore]
public string LanguageCode => LangCode.IsNullOrEmpty() ? "en" : LangCode;
[NotMapped]
public string RequestStatus {
get
{
if (Approved & Available)
{
return "Common.Available";
}
if (Approved & !Available)
{
return "Common.ProcessingRequest";
}
if (!Approved && !Available)
{
return "Common.PendingApproval";
}
return string.Empty;
}
}
}
}

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

@ -15,6 +15,7 @@ export interface IMovieRequests extends IFullBaseRequest {
digitalReleaseDate: Date;
subscribed: boolean;
showSubscribe: boolean;
requestStatus: string;
// For the UI
rootPathOverrideTitle: string;

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

@ -37,16 +37,8 @@
<ng-container matColumnDef="requestStatus">
<th mat-header-cell *matHeaderCellDef > Request Status </th>
<td mat-cell *matCellDef="let element">
<div *ngIf="element.approved && !element.available">{{'Common.ProcessingRequest' | translate}}</div>
<div *ngIf="element.requested && !element.approved && !element.available">{{'Common.PendingApproval' |
translate}}
</div>
<div *ngIf="!element.requested && !element.available && !element.approved">{{'Common.NotRequested' |
translate}}
</div>
</td>
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> Request Status </th>
<td mat-cell *matCellDef="let element"> {{element.requestStatus | translate}} </td>
</ng-container>
<ng-container matColumnDef="actions">