3.2.30.19

This commit is contained in:
Luke Pulverenti
2017-09-13 14:41:48 -04:00
parent ca1ab81d3c
commit 38fe239f44
18 changed files with 80 additions and 68 deletions

View File

@@ -918,9 +918,10 @@ namespace MediaBrowser.Controller.Entities
{
get
{
if (!string.IsNullOrWhiteSpace(OfficialRating))
var officialRating = OfficialRating;
if (!string.IsNullOrWhiteSpace(officialRating))
{
return OfficialRating;
return officialRating;
}
var parent = DisplayParent;
@@ -938,9 +939,10 @@ namespace MediaBrowser.Controller.Entities
{
get
{
if (!string.IsNullOrWhiteSpace(CustomRating))
var customRating = CustomRating;
if (!string.IsNullOrWhiteSpace(customRating))
{
return CustomRating;
return customRating;
}
var parent = DisplayParent;
@@ -2480,5 +2482,21 @@ namespace MediaBrowser.Controller.Entities
{
return null;
}
public virtual ItemUpdateType OnMetadataChanged()
{
var updateType = ItemUpdateType.None;
var item = this;
var inheritedParentalRatingValue = item.GetInheritedParentalRatingValue() ?? 0;
if (inheritedParentalRatingValue != item.InheritedParentalRatingValue)
{
item.InheritedParentalRatingValue = inheritedParentalRatingValue;
updateType |= ItemUpdateType.MetadataImport;
}
return updateType;
}
}
}