github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 14:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1060 from geogolem/clientModeFixForMovieEditor

Browse source 
fix client mode fetching.. only setPageSize when necessary
This commit is contained in:
geogolem 2017-03-07 09:58:49 -05:00 • committed by GitHub
commit b71031f6d3
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/NzbDrone.Api/REST/RestModule.cs
View file

@ -221,13 +221,9 @@ namespace NzbDrone.Api.REST
{ {
int pageSize; int pageSize;
int.TryParse(Request.Query.PageSize.ToString(), out pageSize); int.TryParse(Request.Query.PageSize.ToString(), out pageSize);
if (pageSize == 0) pageSize = 0;
int page; int page;
int.TryParse(Request.Query.Page.ToString(), out page); int.TryParse(Request.Query.Page.ToString(), out page);
if (page == 0) page = 0;
var pagingResource = new PagingResource<TResource> var pagingResource = new PagingResource<TResource>

4
src/UI/Movies/Editor/MovieEditorLayout.js
View file

@ -84,8 +84,8 @@ module.exports = Marionette.Layout.extend({
initialize : function() { initialize : function() {
this.movieCollection = MoviesCollection.clone(); this.movieCollection = MoviesCollection.clone();
var pageSize = parseInt(Config.getValue("pageSize")) || 10; var pageSize = parseInt(Config.getValue("pageSize")) || 10;
this.movieCollection.switchMode('client'); this.movieCollection.switchMode('client', {fetch: false});
this.movieCollection.setPageSize(pageSize); this.movieCollection.setPageSize(pageSize, {fetch: true});
this.movieCollection.bindSignalR(); this.movieCollection.bindSignalR();
this.movieCollection.fullCollection.bindSignalR(); this.movieCollection.fullCollection.bindSignalR();

4
src/UI/Movies/Index/MoviesIndexLayout.js
View file

@ -142,7 +142,9 @@ module.exports = Marionette.Layout.extend({
//debugger; //debugger;
this.seriesCollection.bindSignalR(); this.seriesCollection.bindSignalR();
var pageSize = parseInt(Config.getValue("pageSize")) || 10; var pageSize = parseInt(Config.getValue("pageSize")) || 10;
// this.seriesCollection.setPageSize(pageSize); if (this.series.state.pageSize !== pageSize) {
this.seriesCollection.setPageSize(pageSize);
}
//this.listenTo(MoviesCollection, 'sync', function() { //this.listenTo(MoviesCollection, 'sync', function() {
// this.seriesCollection.fetch(); // this.seriesCollection.fetch();
//}); //});

5
src/UI/Movies/MoviesCollection.js
View file

@ -86,6 +86,9 @@ var Collection = PageableCollection.extend({
}, },
parseState : function(resp) { parseState : function(resp) {
if (this.mode === 'client') {
return {};
}
var direction = -1; var direction = -1;
if (resp.sortDirection == "descending") { if (resp.sortDirection == "descending") {
direction = 1; direction = 1;
@ -94,7 +97,7 @@ var Collection = PageableCollection.extend({
}, },
parseRecords : function(resp) { parseRecords : function(resp) {
if (resp) { if (resp && this.mode !== 'client') {
return resp.records; return resp.records;
} }