starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-21 00:05:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

added new parent methods

Browse Source
This commit is contained in:
Luke Pulverenti
2015-11-11 09:56:31 -05:00
parent db8e51edb6
commit cc19ce0daf
48 changed files with 189 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -167,7 +167,7 @@ namespace MediaBrowser.Server.Implementations.Dto
{
Person = byName.Name
}, user, new string[] { });
}, new string[] { });
return items.ToList();
}
@@ -812,7 +812,7 @@ namespace MediaBrowser.Server.Implementations.Dto
/// <returns>BaseItem.</returns>
private BaseItem GetParentBackdropItem(BaseItem item, BaseItem owner)
{
var parent = item.Parent ?? owner;
var parent = item.GetParent() ?? owner;
while (parent != null)
{
@@ -821,7 +821,7 @@ namespace MediaBrowser.Server.Implementations.Dto
return parent;
}
parent = parent.Parent;
parent = parent.GetParent();
}
return null;
@@ -836,7 +836,7 @@ namespace MediaBrowser.Server.Implementations.Dto
/// <returns>BaseItem.</returns>
private BaseItem GetParentImageItem(BaseItem item, ImageType type, BaseItem owner)
{
var parent = item.Parent ?? owner;
var parent = item.GetParent() ?? owner;
while (parent != null)
{
@@ -845,7 +845,7 @@ namespace MediaBrowser.Server.Implementations.Dto
return parent;
}
parent = parent.Parent;
parent = parent.GetParent();
}
return null;
@@ -1210,15 +1210,15 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.VoteCount = item.VoteCount;
}
if (item.IsFolder)
{
var folder = (Folder)item;
//if (item.IsFolder)
//{
// var folder = (Folder)item;
if (fields.Contains(ItemFields.IndexOptions))
{
dto.IndexOptions = folder.IndexByOptionStrings.ToArray();
}
}
// if (fields.Contains(ItemFields.IndexOptions))
// {
// dto.IndexOptions = folder.IndexByOptionStrings.ToArray();
// }
//}
var supportsPlaceHolders = item as ISupportsPlaceHolders;
if (supportsPlaceHolders != null)