From ae0df2aef077c9c46deedfdcc9840e7bb93199d7 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Mon, 16 Jan 2017 17:12:27 -0500 Subject: [PATCH] Disambiguate Movie from Episode Renaming Fixes #84 --- src/NzbDrone.Api/Movies/RenameMovieModule.cs | 2 +- src/UI/Movies/Details/MoviesDetailsLayout.js | 2 +- src/UI/Rename/RenamePreviewCollection.js | 37 +------------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/NzbDrone.Api/Movies/RenameMovieModule.cs b/src/NzbDrone.Api/Movies/RenameMovieModule.cs index 8736cccb0..a55d4ac60 100644 --- a/src/NzbDrone.Api/Movies/RenameMovieModule.cs +++ b/src/NzbDrone.Api/Movies/RenameMovieModule.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Api.Movies private readonly IRenameMovieFileService _renameMovieFileService; public RenameMovieModule(IRenameMovieFileService renameMovieFileService) - : base("rename") + : base("renameMovie") { _renameMovieFileService = renameMovieFileService; diff --git a/src/UI/Movies/Details/MoviesDetailsLayout.js b/src/UI/Movies/Details/MoviesDetailsLayout.js index 1d01f8439..119c6bd71 100644 --- a/src/UI/Movies/Details/MoviesDetailsLayout.js +++ b/src/UI/Movies/Details/MoviesDetailsLayout.js @@ -109,7 +109,7 @@ module.exports = Marionette.Layout.extend({ element : this.ui.rename, command : { name : 'renameMovieFiles', - movieId : this.model.id, + movieId : this.model.id, seasonNumber : -1 } }); diff --git a/src/UI/Rename/RenamePreviewCollection.js b/src/UI/Rename/RenamePreviewCollection.js index 3048dc135..d42ed24d0 100644 --- a/src/UI/Rename/RenamePreviewCollection.js +++ b/src/UI/Rename/RenamePreviewCollection.js @@ -1,43 +1,8 @@ -// var Backbone = require('backbone'); -// var RenamePreviewModel = require('./RenamePreviewModel'); - -// module.exports = Backbone.Collection.extend({ -// url : window.NzbDrone.ApiRoot + '/rename', -// model : RenamePreviewModel, - -// originalFetch : Backbone.Collection.prototype.fetch, - -// initialize : function(options) { -// if (!options.seriesId) { -// throw 'seriesId is required'; -// } - -// this.seriesId = options.seriesId; -// this.seasonNumber = options.seasonNumber; -// }, - -// fetch : function(options) { -// if (!this.seriesId) { -// throw 'seriesId is required'; -// } - -// options = options || {}; -// options.data = {}; -// options.data.seriesId = this.seriesId; - -// if (this.seasonNumber !== undefined) { -// options.data.seasonNumber = this.seasonNumber; -// } - -// return this.originalFetch.call(this, options); -// } -// }); - var Backbone = require('backbone'); var RenamePreviewModel = require('./RenamePreviewModel'); module.exports = Backbone.Collection.extend({ - url : window.NzbDrone.ApiRoot + '/rename', + url : window.NzbDrone.ApiRoot + '/renameMovie', model : RenamePreviewModel, originalFetch : Backbone.Collection.prototype.fetch,