diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-09-11 09:10:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 09:10:16 +0000 |
| commit | 1d633aac0a9c9b28c216dafe5b0180922f190cc6 (patch) | |
| tree | e0af0ac17b9455f9a42a26f591e6911a6776ab19 /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 50877761f646effbe505de74b317ba52af3e4424 (diff) | |
| parent | 63ebae2f9eb015b1b7a834417c2958c81e82bbf8 (diff) | |
Merge pull request #4093 from crobibero/bad-route
Fix api routes
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index c07ee5a9c..cce4cfbe3 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/Jellyfin.Api/Controllers/VideosController.cs @@ -203,7 +203,7 @@ namespace Jellyfin.Api.Controllers [Authorize(Policy = Policies.RequiresElevation)] [ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status400BadRequest)] - public async Task<ActionResult> MergeVersions([FromQuery, Required] string? itemIds) + public async Task<ActionResult> MergeVersions([FromQuery, Required] string itemIds) { var items = RequestHelpers.Split(itemIds, ',', true) .Select(i => _libraryManager.GetItemById(i)) @@ -334,7 +334,7 @@ namespace Jellyfin.Api.Controllers [ProducesVideoFile] public async Task<ActionResult> GetVideoStream( [FromRoute, Required] Guid itemId, - [FromRoute, Required] string? container, + [FromRoute] string? container, [FromQuery] bool? @static, [FromQuery] string? @params, [FromQuery] string? tag, |