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

CC-1665: Scheduled stream rebroadcasting and recording 

-fix right clicking in playlist builder to view metadata causing exception
This commit is contained in:
Martin Konecny 2012-08-10 14:37:32 -04:00
parent d84ad78984
commit 028f6636dd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/controllers/LibraryController.php
View File

@ -333,11 +333,10 @@ class LibraryController extends Zend_Controller_Action
} }
$this->view->block = $block; $this->view->block = $block;
} else if ($type == "stream") { } else if ($type == "stream") {
$webstream = CcWebstreamQuery::create()->findPK($id); $webstream = CcWebstreamQuery::create()->findPK($id);
$file = new Application_Model_Webstream($webstream); $ws = new Application_Model_Webstream($webstream);
$md = $file->getMetadata(); $md = $ws->getMetadata();
$this->view->md = $md; $this->view->md = $md;
$this->view->type = $type; $this->view->type = $type;

3
airtime_mvc/application/models/Webstream.php
View File

@ -53,8 +53,7 @@ class Application_Model_Webstream{
public function getMetadata() public function getMetadata()
{ {
$webstream = CcWebstreamQuery::create()->findPK($this->id); $subjs = CcSubjsQuery::create()->findPK($this->webstream->getDbCreatorId());
$subjs = CcSubjsQuery::create()->findPK($webstream->getDbCreatorId());
$username = $subjs->getDbLogin(); $username = $subjs->getDbLogin();
return array( return array(