alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-24 09:37:54 +01:00
Code Issues Actions 8 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

10
MediaBrowser.Controller/Entities/UserView.cs
View File

@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using MediaBrowser.Controller.TV;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Controller.Entities
{
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities
public static ITVSeriesManager TVSeriesManager;
[IgnoreDataMember]
[JsonIgnore]
public string CollectionType => ViewType;
public override IEnumerable<Guid> GetIdsForAncestorQuery()
@@ -40,10 +40,10 @@ namespace MediaBrowser.Controller.Entities
return list;
}
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsInheritedParentImages => false;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPlayedStatus => false;
public override int GetChildCount(User user)
@@ -167,7 +167,7 @@ namespace MediaBrowser.Controller.Entities
return Task.CompletedTask;
}
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPeople => false;
}
}