Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-09-11 03:52:33 +02:00
Code Issues Releases Wiki Activity

Fix History for Movie Details page.

Browse Source
This commit is contained in:
Leonardo Galli 2017-01-02 20:41:44 +01:00
parent 2a932fe7e8
commit 0d65984991
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Api/History/HistoryModule.cs
View File

@ -76,8 +76,6 @@ private PagingResource<HistoryResource> GetHistory(PagingResource<HistoryResourc
pagingSpec.FilterExpression = h => h.MovieId == i;
}
var pg = _historyService.Paged(pagingSpec);
return ApplyToPage(_historyService.Paged, pagingSpec, MapToResource);
}

7
src/NzbDrone.Core/History/HistoryRepository.cs
View File

@ -73,8 +73,11 @@ public void DeleteForSeries(int seriesId)
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);
}

2
src/UI/Movies/Details/MoviesDetailsTemplate.hbs
View File

@ -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>

4
src/UI/Movies/History/NoHistoryViewTemplate.hbs
View File

@ -1,3 +1,3 @@
<p class="text-warning">
No history for this episode.
</p>
No history for this movie.
</p>

2
src/UI/Movies/movies.less
View File

@ -272,7 +272,7 @@
}
}
.episode-detail-modal {
#movie-info {
.episode-info {
margin-bottom : 10px;