From 9ccdb4871d626068e0ef2425dd45e23e0811d0a9 Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 25 Feb 2020 21:28:33 -0500 Subject: [PATCH] Fixed: Don't append every MovieId to Delete as a URL Parameter Fixes #4186 Fixes #4188 --- frontend/src/Store/Actions/movieIndexActions.js | 7 +------ src/Radarr.Api.V3/Movies/MovieEditorModule.cs | 5 +---- src/Radarr.Api.V3/Movies/MovieEditorResource.cs | 4 +++- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/frontend/src/Store/Actions/movieIndexActions.js b/frontend/src/Store/Actions/movieIndexActions.js index 87a8a04eb..4ebdc77dd 100644 --- a/frontend/src/Store/Actions/movieIndexActions.js +++ b/frontend/src/Store/Actions/movieIndexActions.js @@ -413,18 +413,13 @@ export const actionHandlers = handleThunks({ }, [BULK_DELETE_MOVIE]: function(getState, payload, dispatch) { - const { - id, - ...queryParams - } = payload; - dispatch(set({ section, isDeleting: true })); const promise = createAjaxRequest({ - url: `/movie/editor?${$.param(queryParams, true)}`, + url: '/movie/editor', method: 'DELETE', data: JSON.stringify(payload), dataType: 'json' diff --git a/src/Radarr.Api.V3/Movies/MovieEditorModule.cs b/src/Radarr.Api.V3/Movies/MovieEditorModule.cs index 499d4a8e6..24f1c1e87 100644 --- a/src/Radarr.Api.V3/Movies/MovieEditorModule.cs +++ b/src/Radarr.Api.V3/Movies/MovieEditorModule.cs @@ -94,12 +94,9 @@ namespace Radarr.Api.V3.Movies { var resource = Request.Body.FromJson(); - var addExclusion = Request.GetBooleanQueryParameter("addNetImportExclusion"); - var deleteFiles = Request.GetBooleanQueryParameter("deleteFiles"); - foreach (var id in resource.MovieIds) { - _movieService.DeleteMovie(id, deleteFiles, addExclusion); + _movieService.DeleteMovie(id, resource.DeleteFiles, resource.AddNetImportExclusion); } return new object(); diff --git a/src/Radarr.Api.V3/Movies/MovieEditorResource.cs b/src/Radarr.Api.V3/Movies/MovieEditorResource.cs index 002abbfc3..44ca50b17 100644 --- a/src/Radarr.Api.V3/Movies/MovieEditorResource.cs +++ b/src/Radarr.Api.V3/Movies/MovieEditorResource.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using NzbDrone.Core.Movies; namespace Radarr.Api.V3.Movies @@ -13,6 +13,8 @@ namespace Radarr.Api.V3.Movies public List Tags { get; set; } public ApplyTags ApplyTags { get; set; } public bool MoveFiles { get; set; } + public bool DeleteFiles { get; set; } + public bool AddNetImportExclusion { get; set; } } public enum ApplyTags