diff --git a/src/NzbDrone.Api/REST/RestModule.cs b/src/NzbDrone.Api/REST/RestModule.cs index 9acfbe7ed..419a16253 100644 --- a/src/NzbDrone.Api/REST/RestModule.cs +++ b/src/NzbDrone.Api/REST/RestModule.cs @@ -124,7 +124,7 @@ namespace NzbDrone.Api.REST Get[ROOT_ROUTE] = options => { var pagingSpec = ReadPagingResourceFromRequest(); - if (pagingSpec.Page == 0 && pagingSpec.PageSize == 0) + if ((pagingSpec.Page == 0 && pagingSpec.PageSize == 0) || pagingSpec.PageSize == -1) { var all = GetResourceAll(); return all.AsResponse(); diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs index 41628fc8a..a900278ec 100644 --- a/src/NzbDrone.Core/Datastore/TableMapping.cs +++ b/src/NzbDrone.Core/Datastore/TableMapping.cs @@ -142,6 +142,9 @@ namespace NzbDrone.Core.Datastore Mapper.Entity().RegisterModel("Movies") .Ignore(s => s.RootFolderPath) + .Ignore(m => m.Actors) + .Ignore(m => m.Genres) + .Ignore(m => m.Tags) .Relationship() .HasOne(s => s.Profile, s => s.ProfileId); //.HasOne(m => m.MovieFile, m => m.MovieFileId); diff --git a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs index 054ed6035..d78e7a499 100644 --- a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs +++ b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs @@ -72,11 +72,11 @@ namespace NzbDrone.Core.MediaCover mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + seriesId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg"; - if (_diskProvider.FileExists(filePath)) + /*if (_diskProvider.FileExists(filePath)) { var lastWrite = _diskProvider.FileGetLastWrite(filePath); mediaCover.Url += "?lastWrite=" + lastWrite.Ticks; - } + }*/ } } diff --git a/src/UI/Movies/FullMovieCollection.js b/src/UI/Movies/FullMovieCollection.js index 7532f33e1..146d13f58 100644 --- a/src/UI/Movies/FullMovieCollection.js +++ b/src/UI/Movies/FullMovieCollection.js @@ -3,7 +3,12 @@ var movieCollection = require('./MoviesCollection'); var fullCollection = movieCollection.clone(); fullCollection.reset(); fullCollection.bindSignalR(); -fullCollection.state.pageSize = 100000; +fullCollection.state.pageSize = -1; +fullCollection.state.page = 0; +fullCollection.parseRecords = function(resp) { + return resp; +}; + fullCollection.fetch({reset : true}); module.exports = fullCollection; diff --git a/src/UI/Movies/MoviesCollection.js b/src/UI/Movies/MoviesCollection.js index 1a1b5b8ff..341d6b657 100644 --- a/src/UI/Movies/MoviesCollection.js +++ b/src/UI/Movies/MoviesCollection.js @@ -85,6 +85,11 @@ var Collection = PageableCollection.extend({ if (this.mode === 'client') { return {}; } + + if (this.state.pageSize == -1) { + return this.state; + } + var direction = -1; if (resp.sortDirection.toLowerCase() === "descending") { direction = 1; @@ -93,7 +98,7 @@ var Collection = PageableCollection.extend({ }, parseRecords : function(resp) { - if (resp && this.mode !== 'client') { + if (resp && this.mode !== 'client' && this.state.pageSize != 0 && this.state.pageSize != -1) { return resp.records; } @@ -247,7 +252,7 @@ var Collection = PageableCollection.extend({ }, add : function(model, options) { - if (this.length >= this.state.pageSize) { + if (this.length >= this.state.pageSize && this.state.pageSize != -1) { return; } this.origAdd.call(this, model, options);