Merge pull request #2215 from MediaBrowser/dev

pass requested fields to data layer

6 files changed, 10 insertions, 30 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index e7f8e6548..2cdd88775 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -168,6 +168,8 @@ namespace MediaBrowser.Model.Configuration
         public MetadataOptions[] MetadataOptions { get; set; }
 
         public bool EnableAutomaticRestart { get; set; }
+        public bool SkipDeserializationForBasicTypes { get; set; }
+        public bool SkipDeserializationForPrograms { get; set; }
 
         public PathSubstitution[] PathSubstitutions { get; set; }
 
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 19853fd2b..7d21f9861 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -787,11 +787,7 @@ namespace MediaBrowser.Model.Dto
         /// <value>The home page URL.</value>
         public string HomePageUrl { get; set; }
 
-        /// <summary>
-        /// Gets or sets the production locations.
-        /// </summary>
-        /// <value>The production locations.</value>
-        public List<string> ProductionLocations { get; set; }
+        public string PlaceOfBirth { get; set; }
 
         /// <summary>
         /// Gets or sets the budget.
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 69754204e..b9b920588 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -396,7 +396,6 @@
     <Compile Include="Updates\CheckForUpdateResult.cs" />
     <Compile Include="Updates\PackageTargetSystem.cs" />
     <Compile Include="Updates\InstallationInfo.cs" />
-    <Compile Include="Updates\PackageType.cs" />
     <Compile Include="Updates\PackageVersionClass.cs" />
     <Compile Include="Entities\EmptyRequestResult.cs" />
     <Compile Include="Configuration\UserConfiguration.cs" />
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 0400e374a..c25fba8cf 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -130,6 +130,8 @@
         /// </summary>
         Metascore,
 
+        OfficialRatingDescription,
+
         OriginalTitle,
 
         /// <summary>
@@ -152,6 +154,8 @@
         /// </summary>
         People,
 
+        PlaceOfBirth,
+
         /// <summary>
         /// The production locations
         /// </summary>
diff --git a/MediaBrowser.Model/Updates/PackageInfo.cs b/MediaBrowser.Model/Updates/PackageInfo.cs
index 191deeb8f..208d5b784 100644
--- a/MediaBrowser.Model/Updates/PackageInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageInfo.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Updates
         /// The internal id of this package.
         /// </summary>
         /// <value>The id.</value>
-        public int id { get; set; }
+        public string id { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
@@ -66,7 +66,7 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        public PackageType type { get; set; }
+        public string type { get; set; }
 
         /// <summary>
         /// Gets or sets the target filename.
@@ -127,7 +127,7 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the total number of ratings for this package.
         /// </summary>
         /// <value>The total ratings.</value>
-        public int totalRatings { get; set; }
+        public int? totalRatings { get; set; }
 
         /// <summary>
         /// Gets or sets the average rating for this package .
diff --git a/MediaBrowser.Model/Updates/PackageType.cs b/MediaBrowser.Model/Updates/PackageType.cs
deleted file mode 100644
index a00196e71..000000000
--- a/MediaBrowser.Model/Updates/PackageType.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace MediaBrowser.Model.Updates
-{
-    /// <summary>
-    /// Enum PackageType
-    /// </summary>
-    public enum PackageType
-    {
-        /// <summary>
-        /// All
-        /// </summary>
-        All,
-        /// <summary>
-        /// The system
-        /// </summary>
-        System,
-        /// <summary>
-        /// The user installed
-        /// </summary>
-        UserInstalled
-    }
-}
\ No newline at end of file