From 47fc7c6aeeb6d4304a03d1ec83489f9702feea51 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 18 May 2017 17:05:47 -0400
Subject: add GenreItems property

---
 MediaBrowser.Model/Dto/BaseItemDto.cs     |  4 +++-
 MediaBrowser.Model/Dto/StudioDto.cs       | 22 +---------------------
 MediaBrowser.Model/Querying/ItemFields.cs |  2 ++
 3 files changed, 6 insertions(+), 22 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 9384446eb2..d446597056 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -346,7 +346,9 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the studios.
         /// </summary>
         /// <value>The studios.</value>
-        public StudioDto[] Studios { get; set; }
+        public NameIdPair[] Studios { get; set; }
+
+        public NameIdPair[] GenreItems { get; set; }
 
         /// <summary>
         /// If the item does not have a logo, this will hold the Id of the Parent that has one.
diff --git a/MediaBrowser.Model/Dto/StudioDto.cs b/MediaBrowser.Model/Dto/StudioDto.cs
index 13623fb1a9..10dc606997 100644
--- a/MediaBrowser.Model/Dto/StudioDto.cs
+++ b/MediaBrowser.Model/Dto/StudioDto.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using MediaBrowser.Model.Serialization;
+using System.Diagnostics;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -27,23 +25,5 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The primary image tag.</value>
         public string PrimaryImageTag { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has primary image.
-        /// </summary>
-        /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
-        [IgnoreDataMember]
-        public bool HasPrimaryImage
-        {
-            get
-            {
-                return PrimaryImageTag != null;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [property changed].
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index ab560875ec..1f2b68b459 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -82,6 +82,8 @@
         /// </summary>
         Genres,
 
+        GenreItems,
+
         /// <summary>
         /// The home page URL
         /// </summary>
-- 
cgit v1.2.3


From 9459bf7ffc5a7bda7160bf25108b554117cc40c0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 18 May 2017 17:16:46 -0400
Subject: 3.2.17.6

---
 Emby.Server.Implementations/Dto/DtoService.cs | 4 ----
 MediaBrowser.Model/Querying/ItemFields.cs     | 2 --
 SharedVersion.cs                              | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index fe5642f1d3..ec4f552a60 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -897,10 +897,6 @@ namespace Emby.Server.Implementations.Dto
             if (fields.Contains(ItemFields.Genres))
             {
                 dto.Genres = item.Genres;
-            }
-
-            if (fields.Contains(ItemFields.GenreItems))
-            {
                 AttachGenreItems(dto, item);
             }
 
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 1f2b68b459..ab560875ec 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -82,8 +82,6 @@
         /// </summary>
         Genres,
 
-        GenreItems,
-
         /// <summary>
         /// The home page URL
         /// </summary>
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 89c95c4239..2d9c474098 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.17.5")]
+[assembly: AssemblyVersion("3.2.17.6")]
-- 
cgit v1.2.3