diff --git a/.gitignore b/.gitignore index 35f6b1226..e47c968bd 100644 --- a/.gitignore +++ b/.gitignore @@ -133,4 +133,5 @@ UpdateLogs/ *.sqo *.userprefs */test-results/* -.idea/* \ No newline at end of file +.idea/* +NzbDrone.Web/* diff --git a/NzbDrone.Api/AutomapperBootstraper.cs b/NzbDrone.Api/AutomapperBootstraper.cs index 230306aaf..783ba9984 100644 --- a/NzbDrone.Api/AutomapperBootstraper.cs +++ b/NzbDrone.Api/AutomapperBootstraper.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Api //Series Mapper.CreateMap() - .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.OID)) + .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id)) .ForMember(dest => dest.CustomStartDate, opt => opt.ResolveUsing().FromMember(src => src.CustomStartDate)) .ForMember(dest => dest.BacklogSetting, opt => opt.MapFrom(src => (Int32)src.BacklogSetting)) .ForMember(dest => dest.NextAiring, opt => opt.ResolveUsing()); diff --git a/NzbDrone.Api/Series/SeriesModule.cs b/NzbDrone.Api/Series/SeriesModule.cs index 69a3b62bd..1ddf6e595 100644 --- a/NzbDrone.Api/Series/SeriesModule.cs +++ b/NzbDrone.Api/Series/SeriesModule.cs @@ -59,7 +59,7 @@ namespace NzbDrone.Api.Series //(we can just create the folder and it won't blow up if it already exists) //We also need to remove any special characters from the filename before attempting to create it - _seriesService.AddSeries("", request.Path, request.OID, request.QualityProfileId, null); + _seriesService.AddSeries(request.Title, request.Path, request.TvDbId, request.QualityProfileId, null); _jobProvider.QueueJob(typeof(ImportNewSeriesJob)); return new Response { StatusCode = HttpStatusCode.Created }; @@ -89,7 +89,7 @@ namespace NzbDrone.Api.Series _seriesRepository.Update(series); if (oldPath != series.Path) - _jobProvider.QueueJob(typeof(DiskScanJob), new { SeriesId = series.OID }); + _jobProvider.QueueJob(typeof(DiskScanJob), new { SeriesId = series.Id }); _seriesRepository.Update(series); @@ -117,7 +117,7 @@ namespace NzbDrone.Api.Series { RuleSet("POST", () => { - RuleFor(s => ((ModelBase)s).OID).GreaterThan(0); + RuleFor(s => ((ModelBase)s).Id).GreaterThan(0); RuleFor(s => s.Path).NotEmpty().Must(_diskProvider.FolderExists); RuleFor(s => s.QualityProfileId).GreaterThan(0); }); diff --git a/NzbDrone.Backbone/AddSeries/Existing/FolderMatchResultViewTemplatate.html b/NzbDrone.Backbone/AddSeries/Existing/FolderMatchResultViewTemplatate.html index e8b8cafb1..c6e0036e3 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/FolderMatchResultViewTemplatate.html +++ b/NzbDrone.Backbone/AddSeries/Existing/FolderMatchResultViewTemplatate.html @@ -1,5 +1,9 @@ 
- - {{seriesName}} {{seriesYear}} - + +
+ {{title}} {{seriesYear}} +
+
+ +
diff --git a/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js b/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js index a553ec432..3e1d126b4 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js +++ b/NzbDrone.Backbone/AddSeries/Existing/ImportSeriesView.js @@ -15,13 +15,13 @@ define([ var self = this; - var seriesId = this.model.get('id'); - var title = this.model.get('seriesName'); + var seriesId = this.model.get('tvDbId'); + var title = this.model.get('title'); var quality = this.options.qualityProfile.val(); var path = this.options.folder.path; var model = new NzbDrone.Series.SeriesModel({ - seriesId:seriesId, + tvDbId: seriesId, title:title, qualityProfileId:quality, path:path @@ -34,6 +34,7 @@ define([ model.save(undefined, { success:function () { var notificationModel = new NzbDrone.Shared.NotificationModel({ + tvDbId: seriesId, title:'Added', message:title, level:'success' diff --git a/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html b/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html index 4080f312f..60c8411e9 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html +++ b/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html @@ -11,7 +11,7 @@
-
+
diff --git a/NzbDrone.Backbone/AddSeries/New/SearchResultTemplate.html b/NzbDrone.Backbone/AddSeries/New/SearchResultTemplate.html index ae141ae57..21f25b71c 100644 --- a/NzbDrone.Backbone/AddSeries/New/SearchResultTemplate.html +++ b/NzbDrone.Backbone/AddSeries/New/SearchResultTemplate.html @@ -1,9 +1,9 @@ 
-
+