diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php index eb454cb94..fd404e94c 100644 --- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php +++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php @@ -37,6 +37,7 @@ class Rest_PodcastController extends Zend_Rest_Controller $result = PodcastQuery::create() // Don't return the Station podcast - we fetch it separately ->filterByDbId($stationPodcastId, Criteria::NOT_EQUAL); + $total = $result->count(); if ($limit > 0) { $result->setLimit($limit); } $result->setOffset($offset) ->orderBy($sortColumn, $sortDir); @@ -44,9 +45,10 @@ class Rest_PodcastController extends Zend_Rest_Controller $podcastArray = $result->toArray(null, false, BasePeer::TYPE_FIELDNAME); + $this->getResponse() ->setHttpResponseCode(200) - ->setHeader('X-TOTAL-COUNT', $result->count()) + ->setHeader('X-TOTAL-COUNT', $total) ->appendBody(json_encode($podcastArray)); } diff --git a/airtime_mvc/public/js/airtime/widgets/table.js b/airtime_mvc/public/js/airtime/widgets/table.js index fb27fb782..dc23f8df8 100644 --- a/airtime_mvc/public/js/airtime/widgets/table.js +++ b/airtime_mvc/public/js/airtime/widgets/table.js @@ -77,7 +77,6 @@ var AIRTIME = (function(AIRTIME) { "bAutoWidth": false, "aaSorting": [], "iDisplayLength": 25, - "iDisplayStart": 25, "aLengthMenu": [25, 50, 100], "oLanguage" : getDatatablesStrings({ "sEmptyTable": $.i18n._(""), @@ -429,6 +428,8 @@ var AIRTIME = (function(AIRTIME) { "type": "GET", "url": sSource, "data": { + "limit": oSettings._iDisplayLength, + "offset": oSettings._iDisplayStart, "sort": sortColName, "sort_dir": sortDir, "search": search