diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2020-12-03 07:51:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 07:51:02 +0100 |
| commit | e042572588592f488aa00853ace5cb21d68293ec (patch) | |
| tree | 794d72c767e6d74fecd23ce012aa5d6a0dfffecd /Jellyfin.Api/Controllers/YearsController.cs | |
| parent | ea20f05de41feb6ba876bc5a17f0d62d419fe04f (diff) | |
| parent | 09b1e571f4e4dad19495e8873a5bc712a3bf9b7c (diff) | |
Merge pull request #4633 from crobibero/guid-params
Use Guid as API parameter type where possible
Diffstat (limited to 'Jellyfin.Api/Controllers/YearsController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/YearsController.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs index ec7c3de97..48c639b08 100644 --- a/Jellyfin.Api/Controllers/YearsController.cs +++ b/Jellyfin.Api/Controllers/YearsController.cs @@ -71,7 +71,7 @@ namespace Jellyfin.Api.Controllers [FromQuery] int? startIndex, [FromQuery] int? limit, [FromQuery] string? sortOrder, - [FromQuery] string? parentId, + [FromQuery] Guid? parentId, [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields, [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] excludeItemTypes, [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] includeItemTypes, @@ -89,16 +89,11 @@ namespace Jellyfin.Api.Controllers .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); User? user = null; - BaseItem parentItem; + BaseItem parentItem = _libraryManager.GetParentItem(parentId, userId); if (userId.HasValue && !userId.Equals(Guid.Empty)) { user = _userManager.GetUserById(userId.Value); - parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.GetUserRootFolder() : _libraryManager.GetItemById(parentId); - } - else - { - parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.RootFolder : _libraryManager.GetItemById(parentId); } IList<BaseItem> items; |
