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

Merge branch '2.5.x' into 2.5.x-saas

Browse source
This commit is contained in:
drigato 2014-02-11 10:29:50 -05:00
commit acb3b9b179
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README
View file

@ -48,3 +48,4 @@ Forums and mailing lists: http://forum.sourcefabric.org
Bug tracker: http://dev.sourcefabric.org Bug tracker: http://dev.sourcefabric.org
Source code: http://github.com/sourcefabric/Airtime Source code: http://github.com/sourcefabric/Airtime
IRC chat: #airtime on Freenode IRC chat: #airtime on Freenode

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -396,12 +396,12 @@ class ApiController extends Zend_Controller_Action
Logging::debug("Received notification of new media item start: $media_id"); Logging::debug("Received notification of new media item start: $media_id");
Application_Model_Schedule::UpdateMediaPlayedStatus($media_id); Application_Model_Schedule::UpdateMediaPlayedStatus($media_id);
try {
$historyService = new Application_Service_HistoryService(); $historyService = new Application_Service_HistoryService();
$historyService->insertPlayedItem($media_id); $historyService->insertPlayedItem($media_id);
//set a 'last played' timestamp for media item //set a 'last played' timestamp for media item
//needed for smart blocks //needed for smart blocks
try {
$mediaType = Application_Model_Schedule::GetType($media_id); $mediaType = Application_Model_Schedule::GetType($media_id);
if ($mediaType == 'file') { if ($mediaType == 'file') {
$file_id = Application_Model_Schedule::GetFileId($media_id); $file_id = Application_Model_Schedule::GetFileId($media_id);

3
airtime_mvc/application/services/HistoryService.php
View file

@ -560,6 +560,9 @@ class Application_Service_HistoryService
try { try {
$item = CcScheduleQuery::create()->findPK($schedId, $this->con); $item = CcScheduleQuery::create()->findPK($schedId, $this->con);
if (is_null($item)) {
throw new Exception("Invalid schedule id: ".$schedId);
}
//TODO figure out how to combine these all into 1 query. //TODO figure out how to combine these all into 1 query.
$showInstance = $item->getCcShowInstances($this->con); $showInstance = $item->getCcShowInstances($this->con);

4
airtime_mvc/tests/README.txt
View file

@ -3,8 +3,8 @@ To get the Airtime unit tests running:
1) Install PHPUnit 1) Install PHPUnit
We explicitly install PHPUnit 3.4 because that's as a new of a version We explicitly install PHPUnit 3.4 because that the most recent version
as is supported by Zend Framework 1: that's still supported by Zend Framework 1:
sudo pear channel-discover pear.phpunit.de sudo pear channel-discover pear.phpunit.de
sudo pear channel-discover pear.symfony.com sudo pear channel-discover pear.symfony.com