Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-5450 : Refactor Media Management 

small fixes for webstream items in playlists
This commit is contained in:
Naomi 2013-11-27 15:46:25 -05:00
parent 017e7e274b
commit 7a07cc4510
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/PlaylistController.php
View File

@ -27,7 +27,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->length = $formatter->format(); $this->view->length = $formatter->format();
$this->view->obj = $obj; $this->view->obj = $obj;
$this->view->contents = $obj->getMediaContents(); $this->view->contents = $obj->getContents();
$this->view->html = $this->view->render('playlist/update.phtml'); $this->view->html = $this->view->render('playlist/update.phtml');
$this->view->name = $obj->getName(); $this->view->name = $obj->getName();
$this->view->description = $obj->getDescription(); $this->view->description = $obj->getDescription();

4
airtime_mvc/application/models/airtime/Playlist.php
View File

@ -30,13 +30,13 @@ class Playlist extends BasePlaylist
/* /*
* returns a list of media contents. * returns a list of media contents.
*/ */
public function getMediaContents($criteria = NULL, PropelPDO $con = NULL) { public function getContents($criteria = NULL, PropelPDO $con = NULL) {
if (is_null($criteria)) { if (is_null($criteria)) {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addAscendingOrderByColumn(MediaContentPeer::POSITION); $criteria->addAscendingOrderByColumn(MediaContentPeer::POSITION);
} }
return parent::getMediaContents($criteria, $con); return parent::getMediaContentsJoinMediaItem($criteria, $con);
} }
} }

4
airtime_mvc/application/models/presentation/PlaylistItemWebstream.php
View File

@ -15,11 +15,11 @@ class Presentation_PlaylistItemWebstream extends Presentation_PlaylistItem
} }
public function getTitle() { public function getTitle() {
$this->item->getName(); return $this->item->getName();
} }
public function getCreator() { public function getCreator() {
return $this->item->getCreator(); return $this->item->getUrl();
} }
public function getCliplength() { public function getCliplength() {

2
airtime_mvc/application/services/MediaService.php
View File

@ -281,7 +281,7 @@ class Application_Service_MediaService
), ),
"Name" => array( "Name" => array(
"isColumn" => true, "isColumn" => true,
"title" => _("Title"), "title" => _("Name"),
"width" => "170px", "width" => "170px",
"class" => "library_title" "class" => "library_title"
), ),

7
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -1,8 +1,3 @@
<?php
$contents = $this->obj->getMediaContents();
$count = count($contents);
?>
<div class="btn-toolbar spl-no-top-margin clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<a href="#" class="close-round" id="lib_pl_close"></a> <a href="#" class="close-round" id="lib_pl_close"></a>
@ -46,7 +41,7 @@
<div style="clear:both; float:none; width:100%;"> <div style="clear:both; float:none; width:100%;">
<ul id="spl_sortable"> <ul id="spl_sortable">
<?php $this->contents = $contents; <?php $this->contents = $this->obj->getContents();
echo $this->render('playlist/update.phtml'); echo $this->render('playlist/update.phtml');
?> ?>
</ul> </ul>