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

CC-3174 : showbuilder

Browse source 
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
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'); $id = $this->_getParam('id');
$type = $this->_getParam('type'); $type = $this->_getParam('type');
if ($type == "audioclip") { try {
$file = Application_Model_StoredFile::Recall($id); if ($type == "audioclip") {
$this->view->type = $type; $file = Application_Model_StoredFile::Recall($id);
$this->view->md = $file->getMetadata(); $this->view->type = $type;
} $this->view->md = $file->getMetadata();
else if ($type == "playlist") { }
$file = new Application_Model_Playlist($id); else if ($type == "playlist") {
$this->view->type = $type;
$this->view->md = $file->getAllPLMetaData();
$this->view->contents = $file->getContents();
}
$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(){ public function uploadFileSoundcloudAction(){

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

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