Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/LibreTime/libretime

Browse source
This commit is contained in:
Robbt 2019-05-06 13:54:23 -04:00
commit f57765b17a
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/modules/rest/controllers/PodcastController.php
View file

@ -36,7 +36,10 @@ class Rest_PodcastController extends Zend_Rest_Controller
$stationPodcastId = Application_Model_Preference::getStationPodcastId(); $stationPodcastId = Application_Model_Preference::getStationPodcastId();
$result = PodcastQuery::create() $result = PodcastQuery::create()
// Don't return the Station podcast - we fetch it separately // Don't return the Station podcast - we fetch it separately
->filterByDbId($stationPodcastId, Criteria::NOT_EQUAL); ->filterByDbId($stationPodcastId, Criteria::NOT_EQUAL)
->leftJoinImportedPodcast()
->withColumn('auto_ingest_timestamp');
$total = $result->count();
if ($limit > 0) { $result->setLimit($limit); } if ($limit > 0) { $result->setLimit($limit); }
$result->setOffset($offset) $result->setOffset($offset)
->orderBy($sortColumn, $sortDir); ->orderBy($sortColumn, $sortDir);
@ -44,9 +47,10 @@ class Rest_PodcastController extends Zend_Rest_Controller
$podcastArray = $result->toArray(null, false, BasePeer::TYPE_FIELDNAME); $podcastArray = $result->toArray(null, false, BasePeer::TYPE_FIELDNAME);
$this->getResponse() $this->getResponse()
->setHttpResponseCode(200) ->setHttpResponseCode(200)
->setHeader('X-TOTAL-COUNT', $result->count()) ->setHeader('X-TOTAL-COUNT', $total)
->appendBody(json_encode($podcastArray)); ->appendBody(json_encode($podcastArray));
} }

3
airtime_mvc/public/js/airtime/library/library.js
View file

@ -1365,7 +1365,8 @@ var AIRTIME = (function(AIRTIME) {
/* Creator */ { "sTitle" : $.i18n._("Creator") , "mDataProp" : "creator" , "sClass" : "library_creator" , "sWidth" : "160px" }, /* Creator */ { "sTitle" : $.i18n._("Creator") , "mDataProp" : "creator" , "sClass" : "library_creator" , "sWidth" : "160px" },
/* Website */ { "sTitle" : $.i18n._("Description") , "mDataProp" : "description" , "bVisible" : false , "sWidth" : "150px" }, /* Website */ { "sTitle" : $.i18n._("Description") , "mDataProp" : "description" , "bVisible" : false , "sWidth" : "150px" },
/* Year */ { "sTitle" : $.i18n._("Owner") , "mDataProp" : "owner" , "bVisible" : false , "sWidth" : "60px" }, /* Year */ { "sTitle" : $.i18n._("Owner") , "mDataProp" : "owner" , "bVisible" : false , "sWidth" : "60px" },
/* URL */ { "sTitle" : $.i18n._("Feed URL") , "mDataProp" : "url" , "bVisible" : false , "sWidth" : "60px" } /* URL */ { "sTitle" : $.i18n._("Feed URL") , "mDataProp" : "url" , "bVisible" : false , "sWidth" : "60px" },
/* Import Date */ { "sTitle" : $.i18n._("Import Date") ,"mDataProp" : "auto_ingest_timestamp", "bVisible" : true , "sWidth" : "60px" },
], ],
ajaxSourceURL = baseUrl+"rest/podcast", ajaxSourceURL = baseUrl+"rest/podcast",
podcastToolbarButtons = AIRTIME.widgets.Table.getStandardToolbarButtons(); podcastToolbarButtons = AIRTIME.widgets.Table.getStandardToolbarButtons();