alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-24 19:14:56 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update to jstree 3.0.8

Browse Source
This commit is contained in:
Luke Pulverenti
2014-12-20 20:23:56 -05:00
parent 0a8291d39b
commit 7b0306dce7
9 changed files with 59 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,8 @@ namespace MediaBrowser.Server.Implementations.Dto
{
var options = new DtoOptions
{
Fields = fields
Fields = fields,
EnableSettings = true
};
// Get everything
@@ -676,7 +677,7 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.IsUnidentified = item.IsUnidentified;
}
if (fields.Contains(ItemFields.Settings))
if (options.EnableSettings)
{
dto.LockedFields = item.LockedFields;
dto.LockData = item.IsLocked;
@@ -1169,7 +1170,7 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.SeasonCount = series.SeasonCount;
if (fields.Contains(ItemFields.Settings))
if (options.EnableSettings)
{
dto.DisplaySpecialsWithSeasons = series.DisplaySpecialsWithSeasons;
}

11
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -1563,14 +1563,11 @@ namespace MediaBrowser.Server.Implementations.Library
return null;
}
var collectionTypes = GetUserRootFolder().Children
return GetUserRootFolder().Children
.OfType<ICollectionFolder>()
.Where(i => !string.IsNullOrEmpty(i.CollectionType) && (string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path)))
.Where(i => string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path))
.Select(i => i.CollectionType)
.Distinct()
.ToList();
return collectionTypes.Count == 1 ? collectionTypes[0] : null;
.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
}
public async Task<UserView> GetNamedView(string name,
@@ -1717,7 +1714,7 @@ namespace MediaBrowser.Server.Implementations.Library
new Naming.Logging.NullLogger());
var locationType = episode.LocationType;
var fileType = /*args.IsDirectory ? FileInfoType.Directory :*/ FileInfoType.File;
var episodeInfo = locationType == LocationType.FileSystem || locationType == LocationType.Offline ?
resolver.Resolve(episode.Path, fileType) :

1
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@@ -402,6 +402,7 @@
"LabelYear": "Year:",
"LabelDateOfBirth": "Date of birth:",
"LabelBirthYear": "Birth year:",
"LabelBirthDate": "Birth date:",
"LabelDeathDate": "Death date:",
"HeaderRemoveMediaLocation": "Remove Media Location",
"MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",