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

Fixed #3599 and moved the collections button to a more suitable location

Browse source
This commit is contained in:
tidusjar 2020-06-10 23:18:03 +01:00
commit e1265046b5
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
View file

@ -149,9 +149,19 @@ namespace Ombi.Core.Engine.V2
if (!string.IsNullOrEmpty(item.Images?.Medium)) if (!string.IsNullOrEmpty(item.Images?.Medium))
{ {
item.Images.Medium = item.Images.Medium.Replace("http", "https"); item.Images.Medium = item.Images.Medium.Replace("http:", "https:");
} }
if (item.Cast?.Any() ?? false)
{
foreach (var cast in item.Cast)
{
if (!string.IsNullOrEmpty(cast.Character?.Image?.Medium))
{
cast.Character.Image.Medium = cast.Character?.Image?.Medium.Replace("http:", "https:");
}
}
}
return await GetExtraInfo(showInfoTask, item); return await GetExtraInfo(showInfoTask, item);
} }

6
src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
View file

@ -28,6 +28,8 @@
<span *ngIf="!movie.available"> <span *ngIf="!movie.available">
<span *ngIf="movie.requested || movie.approved; then requestedBtn else notRequestedBtn"></span> <span *ngIf="movie.requested || movie.approved; then requestedBtn else notRequestedBtn"></span>
<button *ngIf="movie.belongsToCollection" [routerLink]="'/discover/collection/' + movie.belongsToCollection.id" mat-raised-button class="btn-spacing"><i class="fa fa-list"></i> {{'MediaDetails.ViewCollection' | translate}}</button>
<ng-template #requestedBtn> <ng-template #requestedBtn>
<button mat-raised-button *ngIf="!hasRequest || hasRequest && movieRequest && !movieRequest.denied" class="btn-spacing" color="warn" [disabled]><i class="fa fa-check"></i> <button mat-raised-button *ngIf="!hasRequest || hasRequest && movieRequest && !movieRequest.denied" class="btn-spacing" color="warn" [disabled]><i class="fa fa-check"></i>
{{ 'Common.Requested' | translate }}</button> {{ 'Common.Requested' | translate }}</button>
@ -72,9 +74,7 @@
<div class="row"> <div class="row">
<div class="col-12 col-md-2"> <div class="col-12 col-md-2">
<button *ngIf="movie.belongsToCollection" [routerLink]="'/discover/collection/' + movie.belongsToCollection.id" mat-raised-button class="spacing-below full-width mat-elevation-z8">{{movie.belongsToCollection.name}}</button> <mat-card class="mat-elevation-z8 spacing-below" *ngIf="isAdmin && movieRequest" [ngStyle]="{'display': showAdvanced ? '' : 'none' }">
<mat-card class="mat-elevation-z8 spacing-below" *ngIf="isAdmin && movieRequest" [ngStyle]="{'display': showAdvanced ? '' : 'none' }">
<mat-card-content class="medium-font"> <mat-card-content class="medium-font">
<movie-admin-panel [movie]="movieRequest" (radarrEnabledChange)="showAdvanced = $event" (advancedOptionsChange)="setAdvancedOptions($event)"> <movie-admin-panel [movie]="movieRequest" (radarrEnabledChange)="showAdvanced = $event" (advancedOptionsChange)="setAdvancedOptions($event)">
</movie-admin-panel> </movie-admin-panel>

1
src/Ombi/wwwroot/translations/en.json
View file

@ -225,6 +225,7 @@
"RequestAllAlbums": "Request All Albums", "RequestAllAlbums": "Request All Albums",
"ClearSelection": "Clear Selection", "ClearSelection": "Clear Selection",
"RequestSelectedAlbums": "Request Selected Albums", "RequestSelectedAlbums": "Request Selected Albums",
"ViewCollection":"View Collection",
"Casts": { "Casts": {
"CastTitle": "Cast", "CastTitle": "Cast",
"Character": "Character", "Character": "Character",