CC-1665: Scheduled stream rebroadcasting and recording
-fixed context menu for webstreams
This commit is contained in:
parent
fe1aa7a169
commit
442c156458
2 changed files with 11 additions and 4 deletions
|
@ -46,6 +46,8 @@ class WebstreamController extends Zend_Controller_Action
|
|||
$type = "stream";
|
||||
Application_Model_Library::changePlaylist($obj->getId(), $type);
|
||||
*/
|
||||
//clear the session in case an old playlist was open: CC-4196
|
||||
Application_Model_Library::changePlaylist(null, null);
|
||||
|
||||
$this->view->obj = new Application_Model_Webstream($webstream);
|
||||
$this->view->action = "new";
|
||||
|
@ -61,7 +63,11 @@ class WebstreamController extends Zend_Controller_Action
|
|||
throw new Exception("Missing parameter 'id'");
|
||||
}
|
||||
|
||||
|
||||
$webstream = CcWebstreamQuery::create()->findPK($id);
|
||||
if ($webstream) {
|
||||
Application_Model_Library::changePlaylist($id, "stream");
|
||||
}
|
||||
$this->view->obj = new Application_Model_Webstream($webstream);
|
||||
$this->view->action = "edit";
|
||||
$this->view->html = $this->view->render('webstream/webstream.phtml');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue