starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1898 from Bond-009/jsonfix

Browse Source 
Fix Json serialization error

(cherry picked from commit 91600b1c81)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
Joshua M. Boniface
2019-10-20 15:16:01 -04:00
committed by Joshua Boniface
parent 86a50367b2
commit 6e59671cf6
44 changed files with 364 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Controller/Entities/BasePluginFolder.cs
View File

@@ -1,4 +1,4 @@
using MediaBrowser.Model.Serialization;
using System.Text.Json.Serialization;
namespace MediaBrowser.Controller.Entities
{
@@ -8,7 +8,7 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
public abstract class BasePluginFolder : Folder, ICollectionFolder
{
[IgnoreDataMember]
[JsonIgnore]
public virtual string CollectionType => null;
public override bool CanDelete()
@@ -21,10 +21,10 @@ namespace MediaBrowser.Controller.Entities
return true;
}
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsInheritedParentImages => false;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPeople => false;
//public override double? GetDefaultPrimaryImageAspectRatio()