Merge pull request #2677 from MediaBrowser/beta

Beta

1 files changed, 11 insertions, 11 deletions

diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index 4b279031e..5a6004760 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -374,6 +374,8 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public async Task<object> Get(GetNextUpEpisodes request)
         {
+            var options = GetDtoOptions(_authContext, request);
+
             var result = _tvSeriesManager.GetNextUp(new NextUpQuery
             {
                 Limit = request.Limit,
@@ -382,12 +384,10 @@ namespace MediaBrowser.Api
                 StartIndex = request.StartIndex,
                 UserId = request.UserId,
                 EnableTotalRecordCount = request.EnableTotalRecordCount
-            });
+            }, options);
 
             var user = _userManager.GetUserById(request.UserId);
 
-            var options = GetDtoOptions(_authContext, request);
-
             var returnItems = (await _dtoService.GetBaseItemDtos(result.Items, options, user).ConfigureAwait(false)).ToArray();
 
             return ToOptimizedSerializedResultUsingCache(new ItemsResult
@@ -432,14 +432,14 @@ namespace MediaBrowser.Api
                 throw new ResourceNotFoundException("Series not found");
             }
 
-            var seasons = (await series.GetItems(new InternalItemsQuery(user)
+            var seasons = (series.GetItems(new InternalItemsQuery(user)
             {
                 IsMissing = request.IsMissing,
                 IsVirtualUnaired = request.IsVirtualUnaired,
                 IsSpecialSeason = request.IsSpecialSeason,
                 AdjacentTo = request.AdjacentTo
 
-            }).ConfigureAwait(false)).Items.OfType<Season>();
+            })).Items.OfType<Season>();
 
             var dtoOptions = GetDtoOptions(_authContext, request);
 
@@ -469,6 +469,8 @@ namespace MediaBrowser.Api
 
             IEnumerable<Episode> episodes;
 
+            var dtoOptions = GetDtoOptions(_authContext, request);
+
             if (!string.IsNullOrWhiteSpace(request.SeasonId))
             {
                 var season = _libraryManager.GetItemById(new Guid(request.SeasonId)) as Season;
@@ -478,7 +480,7 @@ namespace MediaBrowser.Api
                     throw new ResourceNotFoundException("No season exists with Id " + request.SeasonId);
                 }
 
-                episodes = season.GetEpisodes(user);
+                episodes = season.GetEpisodes(user, dtoOptions);
             }
             else if (request.Season.HasValue)
             {
@@ -489,7 +491,7 @@ namespace MediaBrowser.Api
                     throw new ResourceNotFoundException("Series not found");
                 }
 
-                var season = series.GetSeasons(user).FirstOrDefault(i => i.IndexNumber == request.Season.Value);
+                var season = series.GetSeasons(user, dtoOptions).FirstOrDefault(i => i.IndexNumber == request.Season.Value);
 
                 if (season == null)
                 {
@@ -497,7 +499,7 @@ namespace MediaBrowser.Api
                 }
                 else
                 {
-                    episodes = season.GetEpisodes(user);
+                    episodes = season.GetEpisodes(user, dtoOptions);
                 }
             }
             else
@@ -509,7 +511,7 @@ namespace MediaBrowser.Api
                     throw new ResourceNotFoundException("Series not found");
                 }
 
-                episodes = series.GetEpisodes(user);
+                episodes = series.GetEpisodes(user, dtoOptions);
             }
 
             // Filter after the fact in case the ui doesn't want them
@@ -543,8 +545,6 @@ namespace MediaBrowser.Api
 
             var pagedItems = ApplyPaging(returnList, request.StartIndex, request.Limit);
 
-            var dtoOptions = GetDtoOptions(_authContext, request);
-
             var dtos = (await _dtoService.GetBaseItemDtos(pagedItems, dtoOptions, user).ConfigureAwait(false))
                 .ToArray();