From e6dfd89300babeb99fde590eadc3237d694e5bce Mon Sep 17 00:00:00 2001 From: geogolem Date: Fri, 10 Mar 2017 06:28:38 -0500 Subject: [PATCH 1/2] keep the current page the same after clicking Save the path needs to be updated on models that are changes --- src/UI/Movies/Editor/MovieEditorFooterView.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/UI/Movies/Editor/MovieEditorFooterView.js b/src/UI/Movies/Editor/MovieEditorFooterView.js index 168870b32..5256ddb50 100644 --- a/src/UI/Movies/Editor/MovieEditorFooterView.js +++ b/src/UI/Movies/Editor/MovieEditorFooterView.js @@ -109,6 +109,7 @@ module.exports = Marionette.ItemView.extend({ }); var filterKey = this.moviesCollection.state.filterKey; var filterValue = this.moviesCollection.state.filterValue; + var currentPage = this.moviesCollection.state.currentPage; this.moviesCollection.setFilterMode('all'); //this.moviesCollection.fullCollection.resetFiltered(); for (var j=0; j Date: Sat, 11 Mar 2017 01:37:50 -0500 Subject: [PATCH 2/2] better method to obtain the folderName --- src/NzbDrone.Api/Series/MovieResource.cs | 2 ++ src/NzbDrone.Core/Tv/Movie.cs | 6 ++++++ src/UI/Movies/Editor/MovieEditorFooterView.js | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Api/Series/MovieResource.cs b/src/NzbDrone.Api/Series/MovieResource.cs index 5e263573d..ed6976e6f 100644 --- a/src/NzbDrone.Api/Series/MovieResource.cs +++ b/src/NzbDrone.Api/Series/MovieResource.cs @@ -45,6 +45,7 @@ namespace NzbDrone.Api.Movie public bool Monitored { get; set; } public MovieStatusType MinimumAvailability { get; set; } public bool IsAvailable { get; set; } + public string FolderName { get; set; } public int Runtime { get; set; } public DateTime? LastInfoSync { get; set; } @@ -135,6 +136,7 @@ namespace NzbDrone.Api.Movie MinimumAvailability = model.MinimumAvailability, IsAvailable = model.IsAvailable(), + FolderName = model.FolderName(), SizeOnDisk = size, diff --git a/src/NzbDrone.Core/Tv/Movie.cs b/src/NzbDrone.Core/Tv/Movie.cs index 329752a93..e19a8911d 100644 --- a/src/NzbDrone.Core/Tv/Movie.cs +++ b/src/NzbDrone.Core/Tv/Movie.cs @@ -5,6 +5,7 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Datastore; using NzbDrone.Core.Profiles; using NzbDrone.Core.MediaFiles; +using System.IO; namespace NzbDrone.Core.Tv { @@ -54,6 +55,11 @@ namespace NzbDrone.Core.Tv public bool HasFile => MovieFileId > 0; + public string FolderName() + { + return new DirectoryInfo(Path).Name; + } + public bool IsAvailable(int delay = 0) { //the below line is what was used before delay was implemented, could still be used for cases when delay==0 diff --git a/src/UI/Movies/Editor/MovieEditorFooterView.js b/src/UI/Movies/Editor/MovieEditorFooterView.js index 5256ddb50..3a513f35b 100644 --- a/src/UI/Movies/Editor/MovieEditorFooterView.js +++ b/src/UI/Movies/Editor/MovieEditorFooterView.js @@ -137,8 +137,7 @@ module.exports = Marionette.ItemView.extend({ if (rootFolder !== 'noChange') { var rootFolderPath = RootFolders.get(parseInt(rootFolder, 10)); - var currentPath = m.get('path'); - var folderName = currentPath.substring(currentPath.lastIndexOf('\\')+1); + var folderName = m.get('folderName'); m.set('path', rootFolderPath.get('path')+ folderName); } }