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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-07-26 14:41:22 -04:00
commit ed54e882a3
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
airtime_mvc/application/controllers/LibraryController.php
View file

@ -57,7 +57,11 @@ class LibraryController extends Zend_Controller_Action
$obj = new Application_Model_Block($this->obj_sess->id);
}
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
$menu["pl_add"] = array("name"=> "Add to ".ucfirst($this->obj_sess->type), "icon" => "add-playlist", "icon" => "copy");
if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
} else {
$menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
}
}
}
if ($isAdminOrPM) {
@ -72,6 +76,13 @@ class LibraryController extends Zend_Controller_Action
$obj = new Application_Model_Playlist($id);
} else {
$obj = new Application_Model_Block($id);
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
} else {
$menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
}
}
}
if ($this->obj_sess->id !== $id && $screen == "playlist") {

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

@ -219,7 +219,7 @@ class PlaylistController extends Zend_Controller_Action
$name = 'Untitled Playlist';
if ($type == 'block') {
$name = 'Untitled Smart Block';
$name = 'Untitled Smart Playlist';
}
$obj = new $objInfo['className']();