diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-24 00:54:35 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-24 00:54:35 -0400 |
| commit | c8a735bcb1ba71e9501d18b3044aa30793ff97ee (patch) | |
| tree | 894a2da0c7b9d96d5108b6f2ed57e0f10dfee96a /MediaBrowser.Controller/Entities/TV | |
| parent | 5a5b48feff3a0b0a660aaaa9bdfd04fd0fe711ed (diff) | |
add LocalFileInfo.Id
Diffstat (limited to 'MediaBrowser.Controller/Entities/TV')
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Episode.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Season.cs | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 87074ca02..be7867e06 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -104,6 +104,15 @@ namespace MediaBrowser.Controller.Entities.TV } } + [IgnoreDataMember] + public override BaseItem DisplayParent + { + get + { + return Season ?? Parent; + } + } + /// <summary> /// Gets the user data key. /// </summary> @@ -153,7 +162,7 @@ namespace MediaBrowser.Controller.Entities.TV // Episodes directly in series folder if (season == null) { - var series = FindParent<Series>(); + var series = Series; if (ParentIndexNumber.HasValue) { diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 6804b29b7..542628196 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -44,6 +44,12 @@ namespace MediaBrowser.Controller.Entities.TV } } + [IgnoreDataMember] + public override BaseItem DisplayParent + { + get { return Series ?? Parent; } + } + /// <summary> /// We want to group into our Series /// </summary> |