diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-08 15:31:45 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-08 15:31:45 -0400 |
| commit | b70ecab40a4d83cab0c1bd9a42891640c5e006a7 (patch) | |
| tree | 8ef1695fcd2af93f24eaf68b130fb319e1c6d419 /MediaBrowser.Controller | |
| parent | 1a0a50c8ab2a2ce8a9eb1601b4205899c5d6d073 (diff) | |
fixes for new user settings
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Dto/DtoBuilder.cs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs index 6df8f1aed6..d1a0465cd3 100644 --- a/MediaBrowser.Controller/Dto/DtoBuilder.cs +++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs @@ -364,7 +364,7 @@ namespace MediaBrowser.Controller.Dto // If there is no logo, indicate what parent has one in case the Ui wants to allow inheritance if (!dto.HasLogo) { - var parentWithLogo = GetParentLogoItem(item); + var parentWithLogo = GetParentImageItem(item, ImageType.Logo); if (parentWithLogo != null) { @@ -374,6 +374,19 @@ namespace MediaBrowser.Controller.Dto } } + // If there is no art, indicate what parent has one in case the Ui wants to allow inheritance + if (!dto.HasArtImage) + { + var parentWithImage = GetParentImageItem(item, ImageType.Art); + + if (parentWithImage != null) + { + dto.ParentLogoItemId = GetClientItemId(parentWithImage); + + dto.ParentLogoImageTag = GetImageCacheTag(parentWithImage, ImageType.Art, parentWithImage.GetImage(ImageType.Art)); + } + } + if (fields.Contains(ItemFields.Path)) { dto.Path = item.Path; @@ -751,14 +764,15 @@ namespace MediaBrowser.Controller.Dto /// If an item does not have a logo, this can be used to find the first parent that does have one /// </summary> /// <param name="item">The item.</param> + /// <param name="type">The type.</param> /// <returns>BaseItem.</returns> - private BaseItem GetParentLogoItem(BaseItem item) + private BaseItem GetParentImageItem(BaseItem item, ImageType type) { var parent = item.Parent; while (parent != null) { - if (parent.HasImage(ImageType.Logo)) + if (parent.HasImage(type)) { return parent; } |
