add LocalFileInfo.Id

This commit is contained in:
Luke Pulverenti
2014-10-24 00:54:35 -04:00
parent 5a5b48feff
commit c8a735bcb1
84 changed files with 659 additions and 494 deletions

View File

@@ -429,6 +429,12 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
public virtual BaseItem DisplayParent
{
get { return Parent; }
}
/// <summary>
/// When the item first debuted. For movies this could be premiere date, episodes would be first aired
/// </summary>
@@ -548,7 +554,7 @@ namespace MediaBrowser.Controller.Entities
return CustomRating;
}
var parent = Parent;
var parent = DisplayParent;
if (parent != null)
{
return parent.CustomRatingForComparison;

View File

@@ -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)
{

View File

@@ -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>