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

Merge branch 'CC-3603' into devel

This commit is contained in:
James 2012-04-10 15:28:38 -04:00
parent 74aa9bf4f1 064490a2fd
commit 148fdfb8f9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -30,6 +30,7 @@ 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");
@ -451,6 +452,8 @@ class ScheduleController extends Zend_Controller_Action
if ($type == "instance"){ if ($type == "instance"){
$this->view->action = "edit-show-instance"; $this->view->action = "edit-show-instance";
}else if($type == "rebroadcast"){
$this->view->action = "edit-show-rebroadcast";
} }
try{ try{
@ -635,6 +638,17 @@ class ScheduleController extends Zend_Controller_Action
} }
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');
$data = array(); $data = array();