CC-3603: Calendar->Once you update the rebroadcasted show it disappears
-fixed
This commit is contained in:
parent
79d8eda53a
commit
6e9b179afc
|
@ -31,7 +31,6 @@ class ScheduleController extends Zend_Controller_Action
|
||||||
->addActionContext('set-time-interval', 'json')
|
->addActionContext('set-time-interval', 'json')
|
||||||
->addActionContext('edit-show-instance', 'json')
|
->addActionContext('edit-show-instance', 'json')
|
||||||
->addActionContext('dj-edit-show', 'json')
|
->addActionContext('dj-edit-show', 'json')
|
||||||
->addActionContext('edit-show-rebroadcast', 'json')
|
|
||||||
->initContext();
|
->initContext();
|
||||||
|
|
||||||
$this->sched_sess = new Zend_Session_Namespace("schedule");
|
$this->sched_sess = new Zend_Session_Namespace("schedule");
|
||||||
|
@ -522,11 +521,6 @@ class ScheduleController extends Zend_Controller_Action
|
||||||
// repeating shows. It's value is either "instance","rebroadcast", or "all"
|
// repeating shows. It's value is either "instance","rebroadcast", or "all"
|
||||||
$type = $this->_getParam('type');
|
$type = $this->_getParam('type');
|
||||||
|
|
||||||
/*if($type == "rebroadcast") {
|
|
||||||
//$this->view->action = "edit-show-rebroadcast";
|
|
||||||
} else {
|
|
||||||
$this->view->action = "edit-show";
|
|
||||||
}*/
|
|
||||||
$this->view->action = "edit-show";
|
$this->view->action = "edit-show";
|
||||||
try{
|
try{
|
||||||
$showInstance = new Application_Model_ShowInstance($showInstanceId);
|
$showInstance = new Application_Model_ShowInstance($showInstanceId);
|
||||||
|
@ -695,17 +689,6 @@ class ScheduleController extends Zend_Controller_Action
|
||||||
$this->view->form = $this->view->render('schedule/add-show-form.phtml');
|
$this->view->form = $this->view->render('schedule/add-show-form.phtml');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function editShowRebroadcastAction(){
|
|
||||||
$js = $this->_getParam('data');
|
|
||||||
$data = array();
|
|
||||||
|
|
||||||
//need to convert from serialized jQuery array.
|
|
||||||
foreach($js as $j){
|
|
||||||
$data[$j["name"]] = $j["value"];
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public function djEditShowAction(){
|
public function djEditShowAction(){
|
||||||
$js = $this->_getParam('data');
|
$js = $this->_getParam('data');
|
||||||
|
|
Loading…
Reference in New Issue