mirror of https://github.com/Radarr/Radarr
Fix History for Movie Details page.
This commit is contained in:
parent
2a932fe7e8
commit
0d65984991
|
@ -76,8 +76,6 @@ namespace NzbDrone.Api.History
|
|||
pagingSpec.FilterExpression = h => h.MovieId == i;
|
||||
}
|
||||
|
||||
var pg = _historyService.Paged(pagingSpec);
|
||||
|
||||
return ApplyToPage(_historyService.Paged, pagingSpec, MapToResource);
|
||||
}
|
||||
|
||||
|
|
|
@ -73,8 +73,11 @@ namespace NzbDrone.Core.History
|
|||
|
||||
protected override SortBuilder<History> GetPagedQuery(QueryBuilder<History> query, PagingSpec<History> pagingSpec)
|
||||
{
|
||||
var baseQuery = query.Join<History, Series>(JoinType.Inner, h => h.Series, (h, s) => h.SeriesId == s.Id)
|
||||
.Join<History, Episode>(JoinType.Inner, h => h.Episode, (h, e) => h.EpisodeId == e.Id);
|
||||
var baseQuery = query/*.Join<History, Series>(JoinType.Inner, h => h.Series, (h, s) => h.SeriesId == s.Id)
|
||||
.Join<History, Episode>(JoinType.Inner, h => h.Episode, (h, e) => h.EpisodeId == e.Id)*/
|
||||
.Join<History, Movie>(JoinType.Inner, h => h.Movie, (h, e) => h.MovieId == e.Id);
|
||||
|
||||
|
||||
|
||||
return base.GetPagedQuery(baseQuery, pagingSpec);
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
<div id="info" class="movie-info"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="seasons">
|
||||
<div id="movie-info">
|
||||
<ul class="nav nav-tabs" id="myTab">
|
||||
<li><a href="#movie-history" class="x-movie-history">History</a></li>
|
||||
<li><a href="#movie-search" class="x-movie-search">Search</a></li>
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<p class="text-warning">
|
||||
No history for this episode.
|
||||
</p>
|
||||
No history for this movie.
|
||||
</p>
|
||||
|
|
|
@ -272,7 +272,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
.episode-detail-modal {
|
||||
#movie-info {
|
||||
|
||||
.episode-info {
|
||||
margin-bottom : 10px;
|
||||
|
|
Loading…
Reference in New Issue