Merge pull request #3171 from MediaBrowser/dev

Dev
MediaBrowser · Feb 23, 2018 · 5b8ab71 · 5b8ab71
2 parents 7d6896d + 837b06b
commit 5b8ab71
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 48 deletions.
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1723,17 +1723,13 @@ public async Task<QueryResult<BaseItem>> GetInternalRecordings(RecordingQuery qu
 
             var result = GetEmbyRecordings(query, options, user);
 
-            var servicesResult = await GetInternalRecordingsFromServices(query, user, options, folder.Id, cancellationToken).ConfigureAwait(false);
-
-            if (servicesResult.TotalRecordCount == 0)
-            {
-                return result;
-            }
-            if (result.TotalRecordCount == 0)
+            if (!string.IsNullOrWhiteSpace(query.GroupId))
             {
-                return result;
+                result = new QueryResult<BaseItem>();
             }
 
+            var servicesResult = await GetInternalRecordingsFromServices(query, user, options, folder.Id, cancellationToken).ConfigureAwait(false);
+
             var list = result.Items.ToList();
             list.AddRange(servicesResult.Items);
 

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/list/list.js b/MediaBrowser.WebDashboard/dashboard-ui/list/list.js
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/livetv.html b/MediaBrowser.WebDashboard/dashboard-ui/livetv.html
@@ -94,42 +94,6 @@ <h2 class="sectionTitle sectionTitle-cards">${HeaderAllRecordings}</h2>
                 </div>
                 <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
             </div>
-            <div id="movieRecordings" class="verticalSection hide">
-                <div class="sectionTitleContainer padded-left">
-                    <button type="button" is="emby-button" class="button-flat button-flat-mini sectionTitleTextButton more" data-type="movies">
-                        <h2 class="sectionTitle sectionTitle-cards">${TabMovies}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
-                    </button>
-                </div>
-                <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
-            </div>
-            <div id="episodeRecordings" class="verticalSection hide">
-                <div class="sectionTitleContainer padded-left">
-                    <button type="button" is="emby-button" class="button-flat button-flat-mini sectionTitleTextButton more" data-type="episodes">
-                        <h2 class="sectionTitle sectionTitle-cards">${TabShows}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
-                    </button>
-                </div>
-                <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
-            </div>
-            <div id="sportsRecordings" class="verticalSection hide">
-                <div class="sectionTitleContainer padded-left">
-                    <button type="button" is="emby-button" class="button-flat button-flat-mini sectionTitleTextButton more" data-type="sports">
-                        <h2 class="sectionTitle sectionTitle-cards">${Sports}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
-                    </button>
-                </div>
-                <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
-            </div>
-            <div id="kidsRecordings" class="verticalSection hide">
-                <div class="sectionTitleContainer padded-left">
-                    <button type="button" is="emby-button" class="button-flat button-flat-mini sectionTitleTextButton more" data-type="kids">
-                        <h2 class="sectionTitle sectionTitle-cards">${HeaderForKids}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
-                    </button>
-                </div>
-                <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
-            </div>
             <div id="recordingGroups" class="hide verticalSection">
                 <div class="sectionTitleContainer">
                     <h2 class="sectionTitle sectionTitle-cards padded-left">${HeaderRecordingGroups}</h2>

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/itemdetailpage.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/itemdetailpage.js
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/livetvrecordings.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/livetvrecordings.js
diff --git a/SharedVersion.cs b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.70.18")]
+[assembly: AssemblyVersion("3.3.0")]