From 494eaa0d526a1c3ccfa7504152caf62b6d70839b Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 5 Nov 2016 09:22:28 -0400 Subject: Seems in some installs, pagecount doesn't come in, which is odd. I'm defaulting to 1. --- www/js/EventCtrl.js | 2 +- www/js/TimelineCtrl.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index ce5fec93..c076ea4d 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -346,7 +346,7 @@ angular.module('zmApp.controllers') nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss"); NVRDataModel.getEventsPages($scope.id, nolangFrom, nolangTo) .then(function (data) { - eventsPage = data.pageCount; + eventsPage = data.pageCount || 1; NVRDataModel.debug("EventCtrl: found " + eventsPage + " pages of events"); pageLoaded = true; diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index c7e01b77..027734a4 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -899,7 +899,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla NVRDataModel.getEventsPages(0, fromDateNoLang, toDateNoLang) .then(function(data) { - var pages = parseInt(data.pageCount); + var pages = data.pageCount || 1; var itemsPerPage = parseInt(data.limit); var iterCount; -- cgit v1.2.3