From 8a0820ad1e73b85eca5a07b4b3d0a1b2d4913d3b Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sat, 28 Jan 2017 17:14:51 -0500 Subject: [PATCH 1/2] make year nullable, and rmember the profileid --- src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs | 2 +- src/UI/Settings/NetImport/Edit/NetImportEditView.js | 2 +- .../Settings/NetImport/Edit/NetImportEditViewTemplate.hbs | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs index 175ff0555..e09ce89be 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktAPI.cs @@ -15,7 +15,7 @@ namespace NzbDrone.Core.NetImport.Trakt public class Movie { public string title { get; set; } - public int year { get; set; } + public int? year { get; set; } public Ids ids { get; set; } } diff --git a/src/UI/Settings/NetImport/Edit/NetImportEditView.js b/src/UI/Settings/NetImport/Edit/NetImportEditView.js index 9c6c25101..ba08dd809 100644 --- a/src/UI/Settings/NetImport/Edit/NetImportEditView.js +++ b/src/UI/Settings/NetImport/Edit/NetImportEditView.js @@ -25,7 +25,7 @@ var view = Marionette.ItemView.extend({ events : { 'click .x-back' : '_back', 'click .x-captcha-refresh' : '_onRefreshCaptcha', - 'change .x-root-folder' : '_rootFolderChanged', + 'change .x-root-folder' : '_rootFolderChanged', }, _deleteView : DeleteView, diff --git a/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs b/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs index 7653fa0e0..1d18dea5c 100644 --- a/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs +++ b/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs @@ -66,7 +66,11 @@
- {{> ProfileSelectionPartial profiles}} +
From e8065d07b315eb0ff17a7ed6f7c681aa4df8a255 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sat, 28 Jan 2017 17:27:53 -0500 Subject: [PATCH 2/2] Make year nullable for trakt --- src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs index 611dfc5b8..f6e80bad2 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs @@ -57,7 +57,7 @@ namespace NzbDrone.Core.NetImport.Trakt Title = movie.movie.title, ImdbId = movie.movie.ids.imdb, TmdbId = movie.movie.ids.tmdb, - Year = movie.movie.year + Year = (movie.movie.year ?? 0) }); }