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

CC-3174 : showbuilder 

fixing merge with playlist tooltip
This commit is contained in:
Naomi Aro 2012-02-06 11:59:20 +01:00
parent 776d1b65e8
commit 9e08f857bf
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,18 +245,23 @@ class LibraryController extends Zend_Controller_Action
$id = $this->_getParam('id');
$type = $this->_getParam('type');
if ($type == "audioclip") {
$file = Application_Model_StoredFile::Recall($id);
$this->view->type = $type;
$this->view->md = $file->getMetadata();
}
else if ($type == "playlist") {
$file = new Application_Model_Playlist($id);
$this->view->type = $type;
$this->view->md = $file->getAllPLMetaData();
$this->view->contents = $file->getContents();
}
try {
if ($type == "audioclip") {
$file = Application_Model_StoredFile::Recall($id);
$this->view->type = $type;
$this->view->md = $file->getMetadata();
}
else if ($type == "playlist") {
$file = new Application_Model_Playlist($id);
$this->view->type = $type;
$this->view->md = $file->getAllPLMetaData();
$this->view->contents = $file->getContents();
}
}
catch (Exception $e) {
Logging::log($e->getMessage());
}
}
public function uploadFileSoundcloudAction(){

2
airtime_mvc/application/models/Playlist.php
View File

@ -41,7 +41,7 @@ class Application_Model_Playlist {
"dc:title" => "DbName",
"dc:creator" => "DbCreatorId",
"dc:description" => "DbDescription",
"dcterms:extent" => "getDbLength"
"dcterms:extent" => "DbLength"
);