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

CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2011-12-05 12:56:16 -05:00
parent 162f11022b
commit 73c0408315
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,13 +143,13 @@ class ScheduleController extends Zend_Controller_Action
if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
try{
$show = new Application_Model_ShowInstance($showInstanceId);
$showInstance = new Application_Model_ShowInstance($showInstanceId);
}catch(Exception $e){
$this->view->show_error = true;
return false;
}
$show->deleteShow();
$showInstance->delete();
}
}
@ -821,13 +821,13 @@ class ScheduleController extends Zend_Controller_Action
if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
$showInstanceId = $this->_getParam('id');
try{
$show = new Application_Model_ShowInstance($showInstanceId);
$showInstance = new Application_Model_ShowInstance($showInstanceId);
}catch(Exception $e){
$this->view->show_error = true;
return false;
}
$show->clearShow();
$show->deleteShow();
$showInstance->clearShow();
$showInstance->delete();
// send 'cancel-current-show' command to pypo
Application_Model_RabbitMq::SendMessageToPypo("cancel_current_show", array());
}