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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-17 12:36:57 -04:00
commit 048da282fa
13 changed files with 98 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -796,6 +796,7 @@ class ApiController extends Zend_Controller_Action
{
Logging::info("Notifying RabbitMQ to send message to pypo");
Application_Model_RabbitMq::SendMessageToPypo("reset_liquidsoap_bootstrap", array());
Application_Model_RabbitMq::PushSchedule();
}

3
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -190,8 +190,9 @@ class ScheduleController extends Zend_Controller_Action
if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
try {
$showInstance = new Application_Model_ShowInstance($showInstanceId);
$showInstance = new Application_Model_ShowInstance($showInstanceId);
} catch (Exception $e) {
Logging::info($e->getMessage());
$this->view->show_error = true;
return false;