From bbb4880ba470f7dbad58e20ac0b57fcb7009a832 Mon Sep 17 00:00:00 2001 From: geogolem Date: Fri, 3 Mar 2017 11:46:40 -0500 Subject: [PATCH] respect the page when initializing the layout --- src/UI/Movies/Editor/MovieEditorLayout.js | 5 ++++- src/UI/Movies/Index/MoviesIndexLayout.js | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/UI/Movies/Editor/MovieEditorLayout.js b/src/UI/Movies/Editor/MovieEditorLayout.js index cc78a0cce..6ccb957b0 100644 --- a/src/UI/Movies/Editor/MovieEditorLayout.js +++ b/src/UI/Movies/Editor/MovieEditorLayout.js @@ -12,6 +12,7 @@ var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout'); var FooterView = require('./MovieEditorFooterView'); var GridPager = require('../../Shared/Grid/Pager'); require('../../Mixins/backbone.signalr.mixin'); +var Config = require('../../Config'); window.shownOnce = false; module.exports = Marionette.Layout.extend({ @@ -81,8 +82,10 @@ module.exports = Marionette.Layout.extend({ }, initialize : function() { - this.movieCollection = MoviesCollection.clone(); + this.movieCollection = MoviesCollection.clone(); + var pageSize = parseInt(Config.getValue("pageSize")) || 10; this.movieCollection.switchMode('client'); + this.movieCollection.setPageSize(pageSize); this.movieCollection.bindSignalR(); this.movieCollection.fullCollection.bindSignalR(); diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 07002f0fd..1097efac4 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -24,6 +24,7 @@ var GridPager = require('../../Shared/Grid/Pager'); var FooterModel = require('./FooterModel'); var ToolbarLayout = require('../../Shared/Toolbar/ToolbarLayout'); require('../../Mixins/backbone.signalr.mixin'); +var Config = require('../../Config'); //var MoviesCollectionClient = require('../MoviesCollectionClient'); @@ -139,8 +140,8 @@ module.exports = Marionette.Layout.extend({ //this variable prevents us from showing the list before seriesCollection has been fetched the first time this.seriesCollection = MoviesCollection.clone(); this.seriesCollection.bindSignalR(); - - + var pageSize = parseInt(Config.getValue("pageSize")) || 10; + this.seriesCollection.setPageSize(pageSize); //this.listenTo(MoviesCollection, 'sync', function() { // this.seriesCollection.fetch(); //});